[apparmor] [PATCH] libapparmor: Fix -Wunused-variable GCC warning

Tyler Hicks tyhicks at canonical.com
Fri Jan 29 21:18:19 UTC 2016


The variable was only referenced by commented section of code so move
the declaration into the comment.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 libraries/libapparmor/src/kernel.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/libapparmor/src/kernel.c b/libraries/libapparmor/src/kernel.c
index a3f8efa..d2daf8d 100644
--- a/libraries/libapparmor/src/kernel.c
+++ b/libraries/libapparmor/src/kernel.c
@@ -928,7 +928,6 @@ int aa_query_link_path_len(const char *label, size_t label_len,
 			   int *allowed, int *audited)
 {
 	autofree char *query = NULL;
-	int rc;
 
 	/* + 1 for null separators */
 	size_t size = AA_QUERY_CMD_LABEL_SIZE + label_len + 1 + target_len +
@@ -950,7 +949,7 @@ int aa_query_link_path_len(const char *label, size_t label_len,
 	 * trip to the kernel and adds a race on policy replacement between
 	 * the two queries.
 	 *
-	rc = aa_query_label(AA_MAY_LINK, query, size, allowed, audited);
+	int rc = aa_query_label(AA_MAY_LINK, query, size, allowed, audited);
 	if (rc || !*allowed)
 		return rc;
 	*/
-- 
2.5.0




More information about the AppArmor mailing list