From 4d4f7cdae7c29fc7dfcecc16c6a683dd512532cf Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 7 Apr 2006 18:27:39 +0000 Subject: [PATCH] Fix warning. --- solutions/p2.patch | 2 +- solutions/p3.patch | 2 +- solutions/p4.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/p2.patch b/solutions/p2.patch index 62608d4..e1d7274 100644 --- a/solutions/p2.patch +++ b/solutions/p2.patch @@ -445,7 +445,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c + for (karg = strtok_r (cmd_line_copy, " ", &saveptr); karg != NULL; + karg = strtok_r (NULL, " ", &saveptr)) + { -+ char *uarg = upage + (karg - (char *) kpage); ++ void *uarg = upage + (karg - (char *) kpage); + if (push (kpage, &ofs, &uarg, sizeof uarg) == NULL) + return false; + argc++; diff --git a/solutions/p3.patch b/solutions/p3.patch index 69e7d4b..89fead0 100644 --- a/solutions/p3.patch +++ b/solutions/p3.patch @@ -765,7 +765,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c + for (karg = strtok_r (cmd_line_copy, " ", &saveptr); karg != NULL; + karg = strtok_r (NULL, " ", &saveptr)) + { -+ char *uarg = upage + (karg - (char *) kpage); ++ void *uarg = upage + (karg - (char *) kpage); + if (push (kpage, &ofs, &uarg, sizeof uarg) == NULL) + return false; + argc++; diff --git a/solutions/p4.patch b/solutions/p4.patch index 82a51e1..057d0a7 100644 --- a/solutions/p4.patch +++ b/solutions/p4.patch @@ -2686,7 +2686,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c - *esp = PHYS_BASE; - else - palloc_free_page (kpage); -+ char *uarg = upage + (karg - (char *) kpage); ++ void *uarg = upage + (karg - (char *) kpage); + if (push (kpage, &ofs, &uarg, sizeof uarg) == NULL) + return false; + argc++; -- 2.30.2