From d7eedeb89c9d59562e9e2d82102fd4b3adba7f30 Mon Sep 17 00:00:00 2001
From: William Roberts <william.c.roberts@intel.com>
Date: Fri, 29 Jan 2016 15:12:58 -0800
Subject: [PATCH] checkseapp: remove .data = NULL assignments
Remove the .data=NULL assignments that were pushing the
static keymap mapping horizontal.
(cherry picked from commit 29adea51edfe190e29fd24397e0b8d7abbf5f5f6)
Change-Id: I2e6e78930ac8d1d8b9bd61d9dedb59f4859ea13c
Signed-off-by: William Roberts <william.c.roberts@intel.com>
---
tools/check_seapp.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/tools/check_seapp.c b/tools/check_seapp.c
index 4821ac8ba..a8b7bd8d5 100644
--- a/tools/check_seapp.c
+++ b/tools/check_seapp.c
@@ -201,20 +201,20 @@ static bool validate_selinux_level(char *value, char **errmsg);
*/
key_map rules[] = {
/*Inputs*/
- { .name = "isSystemServer", .dir = dir_in, .data = NULL, .fn_validate = validate_bool },
- { .name = "isAutoPlayApp", .dir = dir_in, .data = NULL, .fn_validate = validate_bool },
- { .name = "isOwner", .dir = dir_in, .data = NULL, .fn_validate = validate_bool },
- { .name = "user", .dir = dir_in, .data = NULL },
- { .name = "seinfo", .dir = dir_in, .data = NULL },
- { .name = "name", .dir = dir_in, .data = NULL },
- { .name = "path", .dir = dir_in, .data = NULL },
- { .name = "isPrivApp", .dir = dir_in, .data = NULL, .fn_validate = validate_bool },
+ { .name = "isSystemServer", .dir = dir_in, .fn_validate = validate_bool },
+ { .name = "isAutoPlayApp", .dir = dir_in, .fn_validate = validate_bool },
+ { .name = "isOwner", .dir = dir_in, .fn_validate = validate_bool },
+ { .name = "user", .dir = dir_in, },
+ { .name = "seinfo", .dir = dir_in, },
+ { .name = "name", .dir = dir_in, },
+ { .name = "path", .dir = dir_in, },
+ { .name = "isPrivApp", .dir = dir_in, .fn_validate = validate_bool },
/*Outputs*/
- { .name = "domain", .dir = dir_out, .data = NULL, .fn_validate = validate_selinux_type },
- { .name = "type", .dir = dir_out, .data = NULL, .fn_validate = validate_selinux_type },
- { .name = "levelFromUid", .dir = dir_out, .data = NULL, .fn_validate = validate_bool },
- { .name = "levelFrom", .dir = dir_out, .data = NULL, .fn_validate = validate_levelFrom },
- { .name = "level", .dir = dir_out, .data = NULL, .fn_validate = validate_selinux_level },
+ { .name = "domain", .dir = dir_out, .fn_validate = validate_selinux_type },
+ { .name = "type", .dir = dir_out, .fn_validate = validate_selinux_type },
+ { .name = "levelFromUid", .dir = dir_out, .fn_validate = validate_bool },
+ { .name = "levelFrom", .dir = dir_out, .fn_validate = validate_levelFrom },
+ { .name = "level", .dir = dir_out, .fn_validate = validate_selinux_level },
};
/**
--
GitLab