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

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

Browse source 
* commit '29c5a78fdc163f7d5e5e3a00729b8c37a89562f6':
  Fix build of adb with gcc-4.9.
This commit is contained in:
Elliott Hughes 2014-08-06 18:01:50 +00:00 • committed by Android Git Automerger
commit 771f6f299f
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

@ -1602,9 +1602,10 @@ top:
return 1; return 1;
} }
#define MAX_ARGV_LENGTH 16
static int do_cmd(transport_type ttype, char* serial, char *cmd, ...) static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
{ {
char *argv[16]; char *argv[MAX_ARGV_LENGTH];
int argc; int argc;
va_list ap; va_list ap;
@ -1621,7 +1622,9 @@ static int do_cmd(transport_type ttype, char* serial, char *cmd, ...)
} }
argv[argc++] = 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); va_end(ap);
#if 0 #if 0