Rename do_power_off to power_off_when_done.

[pintos-anon] / grading / vm / page-merge-par.c

diff --git a/grading/vm/page-merge-par.c b/grading/vm/page-merge-par.c
index dd24576b5dc34c6e9579956e141432f3adfe4537..5c5d62bde778e4c53cc33239efe975b23bb27f59 100644 (file)
--- a/grading/vm/page-merge-par.c
+++ b/grading/vm/page-merge-par.c
@@ -5,7 +5,7 @@
 #else
 #include "posix-compat.h"
 #endif
-#include "arc4.h"
+#include "../lib/arc4.h"
 
 #define CHUNK_SIZE (63 * 1024)                  /* Max file size. */
 #define CHUNK_CNT 8                             /* Number of chunks. */
@@ -46,7 +46,7 @@ sort (void)
       printf ("(page-merge-par) sort chunk %zu\n", i);
 
       /* Write this chunk to a file. */
-      snprintf (fn, sizeof fn, "buf%d", i);
+      snprintf (fn, sizeof fn, "buf%zu", i);
       create (fn, CHUNK_SIZE);
       fd = open (fn);
       if (fd < 0) 
@@ -79,7 +79,7 @@ sort (void)
         }
 
       /* Read chunk back from file. */
-      snprintf (fn, sizeof fn, "buf%d", i);
+      snprintf (fn, sizeof fn, "buf%zu", i);
       fd = open (fn);
       if (fd < 0) 
         {