diff options
author | Riley Andrews <riandrews@google.com> | 2014-12-05 17:37:24 -0800 |
---|---|---|
committer | Riley Andrews <riandrews@google.com> | 2014-12-09 17:25:39 -0800 |
commit | 98f58e83c0f2a282c70706f9cc3c25edc7a2e756 (patch) | |
tree | 1d903651d23a4af9a7224eac0b006dab3d8f7e43 /adb/commandline.c | |
parent | c8514c886e2103d1c4f3f74d5a94472396615b3b (diff) | |
download | system_core-98f58e83c0f2a282c70706f9cc3c25edc7a2e756.zip system_core-98f58e83c0f2a282c70706f9cc3c25edc7a2e756.tar.gz system_core-98f58e83c0f2a282c70706f9cc3c25edc7a2e756.tar.bz2 |
Fix some style issues in adb_commandline().
Change-Id: I8ed7899e7e137405594b3f3cbb0a87eae411dfc9
Diffstat (limited to 'adb/commandline.c')
-rw-r--r-- | adb/commandline.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 425ef7d..f345787 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -1168,17 +1168,17 @@ int adb_commandline(int argc, char **argv) } /* modifiers and flags */ - while(argc > 0) { - if(!strcmp(argv[0],"server")) { + while (argc > 0) { + if (!strcmp(argv[0],"server")) { is_server = 1; - } else if(!strcmp(argv[0],"nodaemon")) { + } else if (!strcmp(argv[0],"nodaemon")) { no_daemon = 1; } else if (!strcmp(argv[0], "fork-server")) { /* this is a special flag used only when the ADB client launches the ADB Server */ is_daemon = 1; - } else if(!strcmp(argv[0],"persist")) { + } else if (!strcmp(argv[0],"persist")) { persist = 1; - } else if(!strncmp(argv[0], "-p", 2)) { + } else if (!strncmp(argv[0], "-p", 2)) { const char *product = NULL; if (argv[0][2] == '\0') { if (argc < 2) return usage(); @@ -1198,7 +1198,7 @@ int adb_commandline(int argc, char **argv) if (isdigit(argv[0][2])) { serial = argv[0] + 2; } else { - if(argc < 2 || argv[0][2] != '\0') return usage(); + if (argc < 2 || argv[0][2] != '\0') return usage(); serial = argv[1]; argc--; argv++; @@ -1209,7 +1209,7 @@ int adb_commandline(int argc, char **argv) ttype = kTransportLocal; } else if (!strcmp(argv[0],"-a")) { gListenAll = 1; - } else if(!strncmp(argv[0], "-H", 2)) { + } else if (!strncmp(argv[0], "-H", 2)) { const char *hostname = NULL; if (argv[0][2] == '\0') { if (argc < 2) return usage(); @@ -1221,7 +1221,7 @@ int adb_commandline(int argc, char **argv) } adb_set_tcp_name(hostname); - } else if(!strncmp(argv[0], "-P", 2)) { + } else if (!strncmp(argv[0], "-P", 2)) { if (argv[0][2] == '\0') { if (argc < 2) return usage(); server_port_str = argv[1]; @@ -1260,13 +1260,13 @@ int adb_commandline(int argc, char **argv) } else { r = launch_server(server_port); } - if(r) { + if (r) { fprintf(stderr,"* could not start server *\n"); } return r; } - if(argc == 0) { + if (argc == 0) { return usage(); } @@ -1304,7 +1304,7 @@ int adb_commandline(int argc, char **argv) } /* adb_connect() commands */ - if(!strcmp(argv[0], "devices")) { + if (!strcmp(argv[0], "devices")) { char *tmp; char *listopt; if (argc < 2) @@ -1317,7 +1317,7 @@ int adb_commandline(int argc, char **argv) } snprintf(buf, sizeof buf, "host:%s%s", argv[0], listopt); tmp = adb_query(buf); - if(tmp) { + if (tmp) { printf("List of devices attached \n"); printf("%s\n", tmp); return 0; @@ -1333,7 +1333,7 @@ int adb_commandline(int argc, char **argv) } snprintf(buf, sizeof buf, "host:connect:%s", argv[1]); tmp = adb_query(buf); - if(tmp) { + if (tmp) { printf("%s\n", tmp); return 0; } else { @@ -1352,7 +1352,7 @@ int adb_commandline(int argc, char **argv) snprintf(buf, sizeof buf, "host:disconnect:"); } tmp = adb_query(buf); - if(tmp) { + if (tmp) { printf("%s\n", tmp); return 0; } else { @@ -1373,7 +1373,7 @@ int adb_commandline(int argc, char **argv) fflush(stdout); } - if(argc < 2) { + if (argc < 2) { D("starting interactive shell\n"); r = interactive_shell(); if (h) { @@ -1396,7 +1396,7 @@ int adb_commandline(int argc, char **argv) for(;;) { D("interactive shell loop. buff=%s\n", buf); fd = adb_connect(buf); - if(fd >= 0) { + if (fd >= 0) { D("about to read_and_dump(fd=%d)\n", fd); read_and_dump(fd); D("read_and_dump() done.\n"); @@ -1407,7 +1407,7 @@ int adb_commandline(int argc, char **argv) r = -1; } - if(persist) { + if (persist) { fprintf(stderr,"\n- waiting for device -\n"); adb_sleep_ms(1000); do_cmd(ttype, serial, "wait-for-device", 0); @@ -1453,7 +1453,7 @@ int adb_commandline(int argc, char **argv) else if (!strcmp(argv[0], "kill-server")) { int fd; fd = _adb_connect("host:kill"); - if(fd == -1) { + if (fd == -1) { fprintf(stderr,"* server not running *\n"); return 1; } @@ -1483,7 +1483,7 @@ int adb_commandline(int argc, char **argv) else snprintf(command, sizeof(command), "%s:", argv[0]); int fd = adb_connect(command); - if(fd >= 0) { + if (fd >= 0) { read_and_dump(fd); adb_close(fd); return 0; @@ -1582,7 +1582,7 @@ int adb_commandline(int argc, char **argv) snprintf(buf, sizeof buf, "%s:%s:%s;%s", host_prefix, command, argv[1], argv[2]); } - if(adb_command(buf)) { + if (adb_command(buf)) { fprintf(stderr,"error: %s\n", adb_error()); return 1; } @@ -1636,7 +1636,7 @@ int adb_commandline(int argc, char **argv) int listonly = 0; int ret; - if(argc < 2) { + if (argc < 2) { /* No local path was specified. */ srcarg = NULL; } else if (argc >= 2 && strcmp(argv[1], "-l") == 0) { @@ -1646,20 +1646,20 @@ int adb_commandline(int argc, char **argv) } else { srcarg = NULL; } - } else if(argc == 2) { + } else if (argc == 2) { /* A local path or "android"/"data" arg was specified. */ srcarg = argv[1]; } else { return usage(); } ret = find_sync_dirs(srcarg, &android_srcpath, &data_srcpath, &vendor_srcpath); - if(ret != 0) return usage(); + if (ret != 0) return usage(); - if(android_srcpath != NULL) + if (android_srcpath != NULL) ret = do_sync_sync(android_srcpath, "/system", listonly); - if(ret == 0 && vendor_srcpath != NULL) + if (ret == 0 && vendor_srcpath != NULL) ret = do_sync_sync(vendor_srcpath, "/vendor", listonly); - if(ret == 0 && data_srcpath != NULL) + if (ret == 0 && data_srcpath != NULL) ret = do_sync_sync(data_srcpath, "/data", listonly); free(android_srcpath); @@ -1676,7 +1676,7 @@ int adb_commandline(int argc, char **argv) format_host_command(buf, sizeof buf, argv[0], ttype, serial); tmp = adb_query(buf); - if(tmp) { + if (tmp) { printf("%s\n", tmp); return 0; } else { |