From f639e96b2bed3e16d4c1d8b0b9ee9632f49958f0 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Thu, 20 Nov 2014 12:07:33 +0000
Subject: [PATCH] Undo idiotic build fix.
Just remove unused variables instead of making them refer to
the wrong statics.
Change-Id: I314bfe91b7912f7d8c9cba7dd55a76d72c879a51
---
tools/sepolicy-analyze/neverallow.c | 4 ++--
tools/sepolicy-analyze/typecmp.c | 7 -------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c
index 60cd29bfd..1da88c08d 100644
--- a/tools/sepolicy-analyze/neverallow.c
+++ b/tools/sepolicy-analyze/neverallow.c
@@ -10,8 +10,8 @@
#include "neverallow.h"
-int debug;
-int warn;
+static int debug;
+static int warn;
void neverallow_usage() {
fprintf(stderr, "\tneverallow [-w|--warn] [-d|--debug] [-n|--neverallows <neverallow-rules>] | [-f|--file <neverallow-file>]\n");
diff --git a/tools/sepolicy-analyze/typecmp.c b/tools/sepolicy-analyze/typecmp.c
index fce32e152..78e37f54a 100644
--- a/tools/sepolicy-analyze/typecmp.c
+++ b/tools/sepolicy-analyze/typecmp.c
@@ -264,10 +264,6 @@ static int analyze_types(policydb_t * policydb, char diff, char equiv)
return 0;
}
-// defined in neverallow.c
-extern int warn;
-extern int debug;
-
int typecmp_func (int argc, char **argv, policydb_t *policydb) {
char ch, diff = 0, equiv = 0;
@@ -286,10 +282,7 @@ int typecmp_func (int argc, char **argv, policydb_t *policydb) {
equiv = 1;
break;
case 'w':
- warn = 1;
- break;
case 'z':
- debug = 1;
break;
default:
USAGE_ERROR = true;
--
GitLab