Rename de_type to search_type

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-01-17 15:09:10 +02:00
parent e4e0cabc21
commit 5b852c0fbb

View File

@ -263,7 +263,7 @@ static char *uuid_str;
static int x509; static int x509;
static int user_sig_type; static int user_sig_type;
static char *keyfile; static char *keyfile;
static char *de_type; static char *search_type;
static int recursive; static int recursive;
static dev_t fs_dev; static dev_t fs_dev;
@ -1180,8 +1180,8 @@ static int cmd_sign_evm(struct command *cmd)
} }
if (recursive) { if (recursive) {
if (de_type) { if (search_type) {
dts = get_file_type(path, de_type); dts = get_file_type(path, search_type);
if (dts < 0) if (dts < 0)
return dts; return dts;
} }
@ -1745,12 +1745,12 @@ static int cmd_ima_fix(struct command *cmd)
xattr = 0; /* do not check xattrs, fix everything */ xattr = 0; /* do not check xattrs, fix everything */
if (de_type) { if (search_type) {
int i; int i;
dts = 0; dts = 0;
for (i = 0; de_type[i]; i++) { for (i = 0; search_type[i]; i++) {
switch (de_type[i]) { switch (search_type[i]) {
case 'f': case 'f':
dts |= REG_MASK; break; dts |= REG_MASK; break;
case 'd': case 'd':
@ -2200,7 +2200,7 @@ int main(int argc, char *argv[])
keyfile = optarg; keyfile = optarg;
break; break;
case 't': case 't':
de_type = optarg; search_type = optarg;
break; break;
case 'r': case 'r':
recursive = 1; recursive = 1;