Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b380de9e authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Remove unused variables. 



Variable "atmark" is currently unused.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent c1e992b9

security/tomoyo/common.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -1424,7 +1424,6 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head, 
{

{

	int pos;

	int pos;

	u8 bit;

	u8 bit;

	const char *atmark = "";

	const char *filename;

	const char *filename;

	const u16 perm = ptr->perm;

	const u16 perm = ptr->perm;
@@ -1441,8 +1440,7 @@ static bool tomoyo_print_single_path_acl(struct tomoyo_io_buffer *head, 
			continue;

			continue;

		msg = tomoyo_sp2keyword(bit);

		msg = tomoyo_sp2keyword(bit);

		pos = head->read_avail;

		pos = head->read_avail;

		if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,

		if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))

				      atmark, filename))

			goto out;

			goto out;

	}

	}

	head->read_bit = 0;

	head->read_bit = 0;
@@ -1466,8 +1464,6 @@ static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head, 
					 ptr)

					 ptr)

{

{

	int pos;

	int pos;

	const char *atmark1 = "";

	const char *atmark2 = "";

	const char *filename1;

	const char *filename1;

	const char *filename2;

	const char *filename2;

	const u8 perm = ptr->perm;

	const u8 perm = ptr->perm;
@@ -1482,8 +1478,8 @@ static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head, 
			continue;

			continue;

		msg = tomoyo_dp2keyword(bit);

		msg = tomoyo_dp2keyword(bit);

		pos = head->read_avail;

		pos = head->read_avail;

		if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,

		if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,

				      atmark1, filename1, atmark2, filename2))

				      filename1, filename2))

			goto out;

			goto out;

	}

	}

	head->read_bit = 0;

	head->read_bit = 0;