commit 880be4622536d86b3d2edc83b2b7de41fa8398c3
author dcashman <dcashman@google.com> Fri Feb 06 10:39:23 2015 -0800
committer dcashman <dcashman@google.com> Fri Feb 06 10:43:02 2015 -0800
tree 91070b751e27f742ce8b39658552ac1ea80e3a56
parent 72fef0b10cf51b30426e7f049fb457972977625c
parent f82f5e01bf17d2856109f72659a3aead9e10b14f

resolved conflicts for merge of f82f5e01 to lmp-mr1-dev.

Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748

tools/sepolicy-analyze/sepolicy-analyze.c

diff --git a/tools/sepolicy-analyze/sepolicy-analyze.c b/tools/sepolicy-analyze/sepolicy-analyze.c
index 252924e..8c0c423 100644
--- a/tools/sepolicy-analyze/sepolicy-analyze.c
+++ b/tools/sepolicy-analyze/sepolicy-analyze.c
@@ -40,7 +40,9 @@
     char *policy;
     struct policy_file pf;
     policydb_t policydb;
-    int rc, i;
+    int rc;
+    int i;
+
     if (argc < 3)
         usage(argv[0]);
     policy = argv[1];
@@ -55,7 +57,5 @@
         }
     }
     usage(argv[0]);
-
-    // will never be called due to exit() call in usage
-    exit(1);
+    exit(0);
 }