diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-03-01 05:47:04 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-02 17:18:42 -0500 |
commit | b380de9e54ec354ccac55fd9a611ffe28b4daa76 (patch) | |
tree | ea172565aa4ffb6395a6137582e8be63d657d6ce /security | |
parent | c1e992b99603a84d7debb188542b64f2d9232c07 (diff) |
TOMOYO: Remove unused variables.
Variable "atmark" is currently unused.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/tomoyo/common.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index e0d0354008b7..be1099b3bb47 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c | |||
@@ -1424,7 +1424,6 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head, | |||
1424 | { | 1424 | { |
1425 | int pos; | 1425 | int pos; |
1426 | u8 bit; | 1426 | u8 bit; |
1427 | const char *atmark = ""; | ||
1428 | const char *filename; | 1427 | const char *filename; |
1429 | const u16 perm = ptr->perm; | 1428 | const u16 perm = ptr->perm; |
1430 | 1429 | ||
@@ -1441,8 +1440,7 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head, | |||
1441 | continue; | 1440 | continue; |
1442 | msg = tomoyo_sp2keyword(bit); | 1441 | msg = tomoyo_sp2keyword(bit); |
1443 | pos = head->read_avail; | 1442 | pos = head->read_avail; |
1444 | if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg, | 1443 | if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename)) |
1445 | atmark, filename)) | ||
1446 | goto out; | 1444 | goto out; |
1447 | } | 1445 | } |
1448 | head->read_bit = 0; | 1446 | head->read_bit = 0; |
@@ -1466,8 +1464,6 @@ static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head, | |||
1466 | ptr) | 1464 | ptr) |
1467 | { | 1465 | { |
1468 | int pos; | 1466 | int pos; |
1469 | const char *atmark1 = ""; | ||
1470 | const char *atmark2 = ""; | ||
1471 | const char *filename1; | 1467 | const char *filename1; |
1472 | const char *filename2; | 1468 | const char *filename2; |
1473 | const u8 perm = ptr->perm; | 1469 | const u8 perm = ptr->perm; |
@@ -1482,8 +1478,8 @@ static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head, | |||
1482 | continue; | 1478 | continue; |
1483 | msg = tomoyo_dp2keyword(bit); | 1479 | msg = tomoyo_dp2keyword(bit); |
1484 | pos = head->read_avail; | 1480 | pos = head->read_avail; |
1485 | if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg, | 1481 | if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg, |
1486 | atmark1, filename1, atmark2, filename2)) | 1482 | filename1, filename2)) |
1487 | goto out; | 1483 | goto out; |
1488 | } | 1484 | } |
1489 | head->read_bit = 0; | 1485 | head->read_bit = 0; |