commit 1a01301b838759188d6646ceac6c285335504b65
author Elliott Hughes <enh@google.com> Thu Nov 14 02:22:31 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 14 02:22:32 2013 +0000
tree 814a01452b057b29429375197325de8f6a7ba10a
parent c68c2887e3e5d0665439554d1b6f12c6591eab12
parent c937e1d4d7ab4094ab8862109af0c67a81704456

Merge "Fix "dalvikvm -help"."

vm/Init.cpp

diff --git a/vm/Init.cpp b/vm/Init.cpp
index 21214d6..4e547d3 100644
--- a/vm/Init.cpp
+++ b/vm/Init.cpp
@@ -80,8 +80,9 @@
  *
  * We follow the tradition of unhyphenated compound words.
  */
-static void usage(const char* progName)
+static void usage()
 {
+    const char* progName = "dalvikvm";
     dvmFprintf(stderr, "%s: [options] class [argument ...]\n", progName);
     dvmFprintf(stderr, "%s: [options] -jar file.jar [argument ...]\n",progName);
     dvmFprintf(stderr, "\n");
@@ -803,7 +804,8 @@
     for (i = 0; i < argc; i++) {
         if (strcmp(argv[i], "-help") == 0) {
             /* show usage and stop */
-            return -1;
+            usage();
+            exit(0);
 
         } else if (strcmp(argv[i], "-version") == 0) {
             /* show version and stop */
@@ -1389,7 +1391,7 @@
     if (cc != 0) {
         if (cc < 0) {
             dvmFprintf(stderr, "\n");
-            usage("dalvikvm");
+            usage();
         }
         return "syntax error";
     }