From 5fc6c70b5c6e1a6ee893155c598277231658fdef Mon Sep 17 00:00:00 2001 From: "hanfei.yu%sun.com" Date: Mon, 8 Aug 2005 18:29:14 +0000 Subject: [PATCH] Clean linux compilation warnings. git-svn-id: svn://10.0.0.236/branches/NSS_LIBPKIX_BRANCH@177342 18797224-902f-48f8-a5cc-f745e15eee43 --- .../nss/cmd/libpkix/pkix_pl/system/mutex/test_mutex.c | 2 ++ .../nss/cmd/libpkix/pkix_pl/system/mutex2/test_mutex2.c | 3 +-- .../nss/cmd/libpkix/pkix_pl/system/mutex3/test_mutex3.c | 3 +-- .../nss/cmd/libpkix/pkix_pl/system/stress/stress_test.c | 3 +-- .../nss/cmd/libpkix/pkix_pl/system/string/test_string.c | 8 +++++--- .../nss/cmd/libpkix/pkix_pl/system/string2/test_string2.c | 5 +++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex/test_mutex.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex/test_mutex.c index 2a86088f50c..2f90b89a864 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex/test_mutex.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex/test_mutex.c @@ -130,6 +130,8 @@ cleanup: PKIX_Shutdown(plContext); + PKIX_TEST_RETURN(); + endTests("Mutexes"); return (0); diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex2/test_mutex2.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex2/test_mutex2.c index 3a5ad973207..9d2d5cb9a74 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex2/test_mutex2.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex2/test_mutex2.c @@ -189,8 +189,7 @@ int main(int argc, char *argv[]) { cleanup: - pkixTestTempResult = PKIX_Shutdown(plContext); - if (pkixTestTempResult) pkixTestErrorResult = pkixTestTempResult; + PKIX_Shutdown(plContext); PKIX_TEST_RETURN(); diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex3/test_mutex3.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex3/test_mutex3.c index 0ede0e2dbd1..fb5a49d5b8a 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex3/test_mutex3.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/mutex3/test_mutex3.c @@ -123,8 +123,7 @@ cleanup: PKIX_TEST_DECREF_AC(mutex); - pkixTestTempResult = PKIX_Shutdown(plContext); - if (pkixTestTempResult) pkixTestErrorResult = pkixTestTempResult; + PKIX_Shutdown(plContext); PKIX_TEST_RETURN(); diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/stress/stress_test.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/stress/stress_test.c index 66afadce560..08520c4cdff 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/stress/stress_test.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/stress/stress_test.c @@ -184,8 +184,7 @@ cleanup: PKIX_TEST_DECREF_AC(byteArrays[i]); } - pkixTestTempResult = PKIX_Shutdown(plContext); - if (pkixTestTempResult) pkixTestErrorResult = pkixTestTempResult; + PKIX_Shutdown(plContext); PKIX_TEST_RETURN(); diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string/test_string.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string/test_string.c index 003f863e21d..4ca2aacccbf 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string/test_string.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string/test_string.c @@ -104,6 +104,8 @@ createStringOther( nullText, PL_strlen(nullText)); + goto cleanup; + cleanup: PKIX_TEST_RETURN(); @@ -118,7 +120,6 @@ testGetEncoded( PKIX_UInt32 *utf16data) { char *temp = NULL; - char *temp2 = NULL; void *dest = NULL; void *dest2 = NULL; char *plainText = "string with\nnewlines and\ttabs"; @@ -264,7 +265,7 @@ testErrorHandling(void) PKIX_TEST_EXPECT_ERROR(PKIX_PL_Sprintf(&testString, NULL, plContext)); PKIX_TEST_EXPECT_ERROR - (PKIX_PL_GetString(0, NULL, &testString, plContext)); + (PKIX_PL_GetString(NULL, NULL, &testString, plContext)); PKIX_TEST_EXPECT_ERROR(PKIX_PL_GetString(NULL, "blah", 0, plContext)); @@ -387,7 +388,6 @@ int main(int argc, char *argv[]) { PKIX_PL_String *testEscAscii = NULL; PKIX_PL_String *testUtf16 = NULL; PKIX_PL_String *ampString = NULL; - PKIX_PL_String *sprintfString = NULL; PKIX_UInt32 utf16Data[3] = {0x00A1D800, 0xDC000FFF, 0xDBC0DC01}; PKIX_UInt32 i, size = 6; @@ -471,6 +471,8 @@ cleanup: PKIX_Shutdown(plContext); + PKIX_TEST_RETURN(); + endTests("String"); return (0); diff --git a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string2/test_string2.c b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string2/test_string2.c index 3a3e7d266f8..f0881497fd6 100755 --- a/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string2/test_string2.c +++ b/mozilla/security/nss/cmd/libpkix/pkix_pl/system/string2/test_string2.c @@ -146,7 +146,7 @@ testGetEncoded(PKIX_PL_String *string, PKIX_UInt32 format) plContext)); if (dest){ - (void) printf("\tResult: %s\n", dest); + (void) printf("\tResult: %s\n", (char *)dest); PKIX_TEST_EXPECT_NO_ERROR(PKIX_PL_Free(dest, plContext)); } @@ -313,7 +313,6 @@ int main(int argc, char *argv[]) { PKIX_PL_String *vivaEspanaString, *straussString, *testUTF16String; PKIX_PL_String *chineseString, *jeanRenoString, *gorbachevString; - char *temp = NULL; PKIX_UInt32 actualMinorVersion; PKIX_UInt32 j = 0; @@ -373,6 +372,8 @@ cleanup: PKIX_Shutdown(plContext); + PKIX_TEST_RETURN(); + endTests("Unicode Strings"); return (0);