-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5yT50ACgkQrlYvE4MpobNnVACgyU2kqA3Tzl2yw+NDnGxCW65b E6UAn0mOISwAq6JRxB7uqpR5kRCcNFpz =/8tI -----END PGP SIGNATURE-----
>From 9991491bf63ccfe24deafd80e09a326bddea6fba Mon Sep 17 00:00:00 2001 From: Guido Trentalancia <guido@xxxxxxxxxxxxxxxx> Date: Wed, 14 Sep 2011 01:33:26 +0200 Subject: [PATCH 67/67] libsemanage: fix semanage_store_access_check calling arguments A few calls to semanage_store_access_check() in the libsemanage tests passed an argument even though it is a void function. Signed-off-by: Guido Trentalancia <guido@xxxxxxxxxxxxxxxx> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- libsemanage/tests/test_semanage_store.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libsemanage/tests/test_semanage_store.c b/libsemanage/tests/test_semanage_store.c index e6814e8..55e6f81 100644 --- a/libsemanage/tests/test_semanage_store.c +++ b/libsemanage/tests/test_semanage_store.c @@ -163,7 +163,7 @@ void test_semanage_store_access_check(void) err = chmod(polpath, 0); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == -1); /* check with permissions 500 */ @@ -174,7 +174,7 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == SEMANAGE_CAN_READ); /* check with permissions 700 */ @@ -185,7 +185,7 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IWUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == SEMANAGE_CAN_WRITE); /* check with lock file 000 and others 500 */ @@ -196,7 +196,7 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == 0); /* check with lock file 000 and others 700 */ @@ -207,7 +207,7 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IWUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == 0); /* remove lock file */ @@ -222,7 +222,7 @@ void test_semanage_store_access_check(void) err = chmod(polpath, 0); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == -1); /* check with no lock file and 500 */ @@ -233,14 +233,14 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == 0); /* check with no lock file but write in lockpath */ err = chmod(lockpath, S_IRUSR | S_IWUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == SEMANAGE_CAN_READ); /* check with no lock file and 700 */ @@ -249,7 +249,7 @@ void test_semanage_store_access_check(void) err = chmod(modpath, S_IRUSR | S_IWUSR | S_IXUSR); CU_ASSERT(err == 0); - err = semanage_store_access_check(sh); + err = semanage_store_access_check(); CU_ASSERT(err == SEMANAGE_CAN_WRITE); } -- 1.7.6.2
