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

Conflicts:
	ass2/mart/sws1-s4109503-s4202015/exercise1d
	ass2/mart/sws1-s4109503-s4202015/exercise1d.c

diff --git a/ass2/mart/sws1-s4109503-s4202015/exercise1d.c b/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
index 3200729..7555bc9 100644 (file)
--- a/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
+++ b/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <inttypes.h>
 #include <stdio.h>
 
 int main(void)
@@ -6,7 +6,7 @@ int main(void)
        FILE *f = fopen("/dev/urandom", "r");
        uint16_t c;
        do {
-               c = fgetc(f) + fgetc(f) * 256;
+               c = fscanf(f, SCNu16);
                printf("%04x\n", c);
        } while(c != 42);
        fclose(f);