tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."

Browse source 
* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
  Fix build of adb with gcc-4.9.
This commit is contained in:
Elliott Hughes 2014-08-06 18:06:33 +00:00 committed by Android Git Automerger
commit e772705a59
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/commandline.c
View file

@ -1746,9 +1746,10 @@ top:
return 1;
}
#define MAX_ARGV_LENGTH 16
static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
{
char *argv[16];
char *argv[MAX_ARGV_LENGTH];
int argc;
va_list ap;
@ -1765,7 +1766,9 @@ static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
}
argv[argc++] = cmd;
while((argv[argc] = va_arg(ap, char*)) != 0) argc++;
while(argc < MAX_ARGV_LENGTH &&
(argv[argc] = va_arg(ap, char*)) != 0) argc++;
assert(argc < MAX_ARGV_LENGTH);
va_end(ap);
#if 0