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

am 3d561748: am ec035950: Merge "Clean up -p handling slightly."

Browse source 
* commit '3d5617487c07f1fcbdf23755e0ca01559e3c5f3b':
  Clean up -p handling slightly.
This commit is contained in:
Elliott Hughes 2015-07-31 22:32:00 +00:00 • committed by Android Git Automerger
commit 5e6d1dcfac
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/commandline.cpp
View file

@ -998,7 +998,7 @@ int adb_commandline(int argc, const char **argv) {
/* this is a special flag used only when the ADB client launches the ADB Server */
is_daemon = 1;
} else if (!strncmp(argv[0], "-p", 2)) {
const char *product = NULL;
const char* product = nullptr;
if (argv[0][2] == '\0') {
if (argc < 2) return usage();
product = argv[1];
@ -1007,7 +1007,7 @@ int adb_commandline(int argc, const char **argv) {
} else {
product = argv[0] + 2;
}
if (product) gProductOutPath = find_product_out_path(product);
gProductOutPath = find_product_out_path(product);
if (gProductOutPath.empty()) {
fprintf(stderr, "adb: could not resolve \"-p %s\"\n", product);
return usage();