Commit e2f76ad7 authored by David Gow's avatar David Gow Committed by John Johansen
Browse files

apparmor: test: Remove some casts which are no-longer required 



With some of the stricter type checking in KUnit's EXPECT macros
removed, several casts in policy_unpack_test are no longer required.

Remove the unnecessary casts, making the conditions clearer.

Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Acked-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 417ea9fe

security/apparmor/policy_unpack_test.c

+6 −6
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void policy_unpack_test_unpack_array_out_of_bounds(struct kunit *test) 


	array_size = unpack_array(puf->e, name);



	KUNIT_EXPECT_EQ(test, array_size, (u16)0);

	KUNIT_EXPECT_EQ(test, array_size, 0);

	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos,

		puf->e->start + TEST_NAMED_ARRAY_BUF_OFFSET);

}
@@ -391,10 +391,10 @@ static void policy_unpack_test_unpack_u16_chunk_basic(struct kunit *test) 


	size = unpack_u16_chunk(puf->e, &chunk);



	KUNIT_EXPECT_PTR_EQ(test, (void *)chunk,

	KUNIT_EXPECT_PTR_EQ(test, chunk,

			    puf->e->start + TEST_U16_OFFSET + 2);

	KUNIT_EXPECT_EQ(test, size, (size_t)TEST_U16_DATA);

	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, (void *)(chunk + TEST_U16_DATA));

	KUNIT_EXPECT_EQ(test, size, TEST_U16_DATA);

	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, (chunk + TEST_U16_DATA));

}



static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_1(
@@ -408,7 +408,7 @@ static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_1( 


	size = unpack_u16_chunk(puf->e, &chunk);



	KUNIT_EXPECT_EQ(test, size, (size_t)0);

	KUNIT_EXPECT_EQ(test, size, 0);

	KUNIT_EXPECT_NULL(test, chunk);

	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->end - 1);

}
@@ -430,7 +430,7 @@ static void policy_unpack_test_unpack_u16_chunk_out_of_bounds_2( 


	size = unpack_u16_chunk(puf->e, &chunk);



	KUNIT_EXPECT_EQ(test, size, (size_t)0);

	KUNIT_EXPECT_EQ(test, size, 0);

	KUNIT_EXPECT_NULL(test, chunk);

	KUNIT_EXPECT_PTR_EQ(test, puf->e->pos, puf->e->start + TEST_U16_OFFSET);

}