diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-11 22:46:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-11 22:46:35 +0000 |
| commit | 8779c4eab43956ecf626bbece3f6f3bc54970d6a (patch) | |
| tree | 02ca33114993322dbc2869a4cd54563ff34f9138 | |
| parent | bcf1454cf6a2fadc30c5189c3756b3cb96149745 (diff) | |
| parent | 8dfdf650abf4a9c05dbc7c60b7baee22e43c07b5 (diff) | |
| download | system_core-8779c4eab43956ecf626bbece3f6f3bc54970d6a.zip system_core-8779c4eab43956ecf626bbece3f6f3bc54970d6a.tar.gz system_core-8779c4eab43956ecf626bbece3f6f3bc54970d6a.tar.bz2 | |
Merge "Minor cleanups."
| -rw-r--r-- | toolbox/ls.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ static int listfile_long(const char *path, struct stat *s, int flags) 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 @@ static int listfile_long(const char *path, struct stat *s, int flags) 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 @@ static int listfile(const char *dirname, const char *filename, int flags) } 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)*/ { |