ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am af9e9d97: am f0a68b54: am 8779c4ea: Merge "Minor cleanups."

Browse source 
* commit 'af9e9d97ee7a53fd5f315ac16b63cc41a3207c33':
  Minor cleanups.
This commit is contained in:
Nick Kralevich 2013-12-11 22:56:29 +00:00 • committed by Android Git Automerger
commit bfb1d8a275
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toolbox/ls.c
View file

@ -209,7 +209,7 @@ static int listfile_long(const char *path, struct stat *s, int flags)
break; break;
case S_IFLNK: { case S_IFLNK: {
char linkto[256]; char linkto[256];
int len; ssize_t len;
len = readlink(path, linkto, 256); len = readlink(path, linkto, 256);
if(len < 0) return -1; if(len < 0) return -1;
@ -235,7 +235,7 @@ static int listfile_long(const char *path, struct stat *s, int flags)
return 0; 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 mode[16];
char user[32]; char user[32];
@ -324,7 +324,7 @@ static int listfile(const char *dirname, const char *filename, int flags)
} }
if ((flags & LIST_MACLABEL) != 0) { if ((flags & LIST_MACLABEL) != 0) {
return listfile_maclabel(pathname, &s, flags); return listfile_maclabel(pathname, &s);
} else if ((flags & LIST_LONG) != 0) { } else if ((flags & LIST_LONG) != 0) {
return listfile_long(pathname, &s, flags); return listfile_long(pathname, &s, flags);
} else /*((flags & LIST_SIZE) != 0)*/ { } else /*((flags & LIST_SIZE) != 0)*/ {