commit 8779c4eab43956ecf626bbece3f6f3bc54970d6a
author Nick Kralevich <nnk@google.com> Wed Dec 11 22:46:34 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 22:46:35 2013 +0000
tree 02ca33114993322dbc2869a4cd54563ff34f9138
parent bcf1454cf6a2fadc30c5189c3756b3cb96149745
parent 8dfdf650abf4a9c05dbc7c60b7baee22e43c07b5

Merge "Minor cleanups."

toolbox/ls.c

diff --git a/toolbox/ls.c b/toolbox/ls.c
index c736958..8467628 100644
--- a/toolbox/ls.c
+++ b/toolbox/ls.c
@@ -209,7 +209,7 @@
         break;
     case S_IFLNK: {
         char linkto[256];
-        int len;
+        ssize_t len;
 
         len = readlink(path, linkto, 256);
         if(len < 0) return -1;
@@ -235,7 +235,7 @@
     return 0;
 }
 
-static int listfile_maclabel(const char *path, struct stat *s, int flags)
+static int listfile_maclabel(const char *path, struct stat *s)
 {
     char mode[16];
     char user[32];
@@ -324,7 +324,7 @@
     }
 
     if ((flags & LIST_MACLABEL) != 0) {
-        return listfile_maclabel(pathname, &s, flags);
+        return listfile_maclabel(pathname, &s);
     } else if ((flags & LIST_LONG) != 0) {
         return listfile_long(pathname, &s, flags);
     } else /*((flags & LIST_SIZE) != 0)*/ {