Merge branch 'master' of https://github.com/dopefishh/sws1

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1d.c b/ass2/chris/sws1-s4109503-s4202015/exercise1d.c
index 9a3874d..0143950 100644 (file)
--- a/ass2/chris/sws1-s4109503-s4202015/exercise1d.c
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1d.c
@@ -1,13 +1,13 @@
 #include<stdio.h>
 #include<stdint.h>
 
-int main(){
-       FILE *fp = fopen("/dev/urandom","r");
-       uint16_t read = 0;
+int main(void){
+       FILE *f = fopen("/dev/urandom","r");
+       uint16_t r = 0;
        do{
-               fread(&read, 2, 1, fp);
-               printf("%x \n", read);
-       }while(read != 42);
-       fclose(fp);
+               fread(&r, 2, 1, f);
+               printf("%x\n", r);
+       }while(r != 42);
+       fclose(f);
        return 0;
 }

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1d.txt b/ass2/chris/sws1-s4109503-s4202015/exercise1d.txt
new file mode 100644 (file)
index 0000000..9be5564
--- /dev/null
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1d.txt
@@ -0,0 +1,10 @@
+28471
+147255
+93264
+11169
+4149
+62615
+24990
+23715
+58094
+42303

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1e.txt b/ass2/chris/sws1-s4109503-s4202015/exercise1e.txt
new file mode 100644 (file)
index 0000000..c234594
--- /dev/null
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1e.txt
@@ -0,0 +1 @@
+(for i in {1..10}; do ./a.out | wc -l; done;) > exercise1d.txt