Merge "Moar C++ refactoring."
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 1627ba8..b5a3352 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1153,27 +1153,33 @@
printf("========================================================\n");
}
-static void usage() {
- fprintf(stderr,
- "usage: dumpstate [-h] [-b soundfile] [-e soundfile] [-o file [-d] [-p] "
- "[-z]] [-s] [-S] [-q] [-B] [-P] [-R] [-V version]\n"
- " -h: display this help message\n"
- " -b: play sound file instead of vibrate, at beginning of job\n"
- " -e: play sound file instead of vibrate, at end of job\n"
- " -o: write to file (instead of stdout)\n"
- " -d: append date to filename (requires -o)\n"
- " -p: capture screenshot to filename.png (requires -o)\n"
- " -z: generate zipped file (requires -o)\n"
- " -s: write output to control socket (for init)\n"
- " -S: write file location to control socket (for init; requires -o and -z)"
- " -q: disable vibrate\n"
- " -B: send broadcast when finished (requires -o)\n"
- " -P: send broadcast when started and update system properties on "
- "progress (requires -o and -B)\n"
- " -R: take bugreport in remote mode (requires -o, -z, -d and -B, "
- "shouldn't be used with -P)\n"
- " -V: sets the bugreport format version (valid values: %s)\n",
- VERSION_DEFAULT.c_str());
+static void ShowUsageAndExit(int exitCode = 1) {
+ fprintf(stderr,
+ "usage: dumpstate [-h] [-b soundfile] [-e soundfile] [-o file [-d] [-p] "
+ "[-z]] [-s] [-S] [-q] [-B] [-P] [-R] [-V version]\n"
+ " -h: display this help message\n"
+ " -b: play sound file instead of vibrate, at beginning of job\n"
+ " -e: play sound file instead of vibrate, at end of job\n"
+ " -o: write to file (instead of stdout)\n"
+ " -d: append date to filename (requires -o)\n"
+ " -p: capture screenshot to filename.png (requires -o)\n"
+ " -z: generate zipped file (requires -o)\n"
+ " -s: write output to control socket (for init)\n"
+ " -S: write file location to control socket (for init; requires -o and -z)"
+ " -q: disable vibrate\n"
+ " -B: send broadcast when finished (requires -o)\n"
+ " -P: send broadcast when started and update system properties on "
+ "progress (requires -o and -B)\n"
+ " -R: take bugreport in remote mode (requires -o, -z, -d and -B, "
+ "shouldn't be used with -P)\n"
+ " -V: sets the bugreport format version (valid values: %s)\n",
+ VERSION_DEFAULT.c_str());
+ exit(exitCode);
+}
+
+static void ExitOnInvalidArgs() {
+ fprintf(stderr, "invalid combination of args\n");
+ ShowUsageAndExit();
}
static void wake_lock_releaser() {
@@ -1365,8 +1371,12 @@
case 'R': is_remote_mode = 1; break;
case 'B': do_broadcast = 1; break;
case 'V': version = optarg; break;
- case '?': printf("\n");
- case 'h': usage(); exit(1);
+ case 'h':
+ ShowUsageAndExit(0);
+ break;
+ default:
+ fprintf(stderr, "Invalid option: %c\n", c);
+ ShowUsageAndExit();
// clang-format on
}
}
@@ -1394,28 +1404,23 @@
}
if ((do_zip_file || do_add_date || ds.updateProgress_ || do_broadcast) && !use_outfile) {
- usage();
- exit(1);
+ ExitOnInvalidArgs();
}
if (use_control_socket && !do_zip_file) {
- usage();
- exit(1);
+ ExitOnInvalidArgs();
}
if (ds.updateProgress_ && !do_broadcast) {
- usage();
- exit(1);
+ ExitOnInvalidArgs();
}
if (is_remote_mode && (ds.updateProgress_ || !do_broadcast || !do_zip_file || !do_add_date)) {
- usage();
- exit(1);
+ ExitOnInvalidArgs();
}
if (version != VERSION_DEFAULT) {
- usage();
- exit(1);
+ ShowUsageAndExit();
}
MYLOGI("bugreport format version: %s\n", version.c_str());
diff --git a/cmds/installd/tests/Android.bp b/cmds/installd/tests/Android.bp
index 05ddf8e..447c8bd 100644
--- a/cmds/installd/tests/Android.bp
+++ b/cmds/installd/tests/Android.bp
@@ -6,6 +6,7 @@
shared_libs: [
"libbase",
"libutils",
+ "liblog",
"libcutils",
],
static_libs: [