From: William Roberts <william.c.robe...@intel.com>

When building for Android, this error manifests itself:

label_file.c:570:7: error: unused variable ‘subs_file’ [-Werror=unused-variable]
  char subs_file[PATH_MAX + 1];

Fix it by moving the variable into the ifdef'd usage block.

Signed-off-by: William Roberts <william.c.robe...@intel.com>
---
 libselinux/src/label_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
index adf3dcc..a4dc3cd 100644
--- a/libselinux/src/label_file.c
+++ b/libselinux/src/label_file.c
@@ -567,7 +567,6 @@ static int init(struct selabel_handle *rec, const struct 
selinux_opt *opts,
        struct saved_data *data = (struct saved_data *)rec->data;
        const char *path = NULL;
        const char *prefix = NULL;
-       char subs_file[PATH_MAX + 1];
        int status = -1, baseonly = 0;
 
        /* Process arguments */
@@ -585,6 +584,7 @@ static int init(struct selabel_handle *rec, const struct 
selinux_opt *opts,
                }
 
 #if !defined(BUILD_HOST) && !defined(ANDROID)
+       char subs_file[PATH_MAX + 1];
        /* Process local and distribution substitution files */
        if (!path) {
                rec->dist_subs =
-- 
1.9.1

_______________________________________________
Seandroid-list mailing list
Seandroid-list@tycho.nsa.gov
To unsubscribe, send email to seandroid-list-le...@tycho.nsa.gov.
To get help, send an email containing "help" to 
seandroid-list-requ...@tycho.nsa.gov.

Reply via email to