diff options
author | dcashman <dcashman@google.com> | 2015-02-06 10:39:23 -0800 |
---|---|---|
committer | dcashman <dcashman@google.com> | 2015-02-06 10:43:02 -0800 |
commit | 880be4622536d86b3d2edc83b2b7de41fa8398c3 (patch) | |
tree | 91070b751e27f742ce8b39658552ac1ea80e3a56 | |
parent | 72fef0b10cf51b30426e7f049fb457972977625c (diff) | |
parent | f82f5e01bf17d2856109f72659a3aead9e10b14f (diff) | |
download | sepolicy-lollipop-mr1-dev.tar.gz |
resolved conflicts for merge of f82f5e01 to lmp-mr1-dev.android-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748
-rw-r--r-- | tools/sepolicy-analyze/sepolicy-analyze.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) } } usage(argv[0]); - - // will never be called due to exit() call in usage - exit(1); + exit(0); } |