auto import from //branches/cupcake/...@130745

4 files changed, 5 insertions, 1 deletions

diff --git a/showmap/showmap.c b/showmap/showmap.c
index e8c7dd50..4abd56a8 100644
--- a/showmap/showmap.c
+++ b/showmap/showmap.c
@@ -78,6 +78,7 @@ again:
     if(fgets(line, 1024, fp) == 0) goto oops;
     if(sscanf(line, "Private_Dirty: %d kB", &mi->private_dirty) != 1) goto oops;
     if(fgets(line, 1024, fp) == 0) goto oops;
+    if(fgets(line, 1024, fp) == 0) goto oops;
 
     if(skip) {
         free(mi);
@@ -86,6 +87,7 @@ again:
 
     return mi;
 oops:
+    fprintf(stderr, "WARNING: Format of /proc/<pid>/smaps has changed!\n");
     free(mi);
     return 0;
 }
diff --git a/sound/playwav.c b/sound/playwav.c
index 6d6bce75..bb37d4a9 100644
--- a/sound/playwav.c
+++ b/sound/playwav.c
@@ -323,6 +323,7 @@ int mp3_play(const char *fn)
 
     close(fd);
     close(afd);
+    return 0;
 }
 
 int main(int argc, char **argv)
diff --git a/tests/cpueater/cpueater.c b/tests/cpueater/cpueater.c
index b7d69ff9..c7911392 100644
--- a/tests/cpueater/cpueater.c
+++ b/tests/cpueater/cpueater.c
@@ -75,6 +75,7 @@ int main(int argc, char *argv[])
               exit(0);
               break;
     }
+  return 0;
 }
 
 
diff --git a/tests/fstest/perm_checker.c b/tests/fstest/perm_checker.c
index 5cead10b..86d2cdce 100644
--- a/tests/fstest/perm_checker.c
+++ b/tests/fstest/perm_checker.c
@@ -369,7 +369,7 @@ static int check_path(const char *name)
         closedir(d);
         return retval;
     } else if (S_ISLNK(s.st_mode)) {
-        validate_link(name, PERMS(s.st_mode), s.st_uid, s.st_gid);
+        return validate_link(name, PERMS(s.st_mode), s.st_uid, s.st_gid);
     } else {
         return validate_file(name, PERMS(s.st_mode), s.st_uid, s.st_gid);
     }