diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | egg/egg-openssl.c | 2 | ||||
| -rw-r--r-- | egg/tests/unit-test-openssl.c | 2 | ||||
| -rw-r--r-- | egg/tests/unit-test-symkey.c | 2 | ||||
| -rw-r--r-- | gp11/tests/gp11-test-module.c | 8 | ||||
| -rw-r--r-- | pkcs11/rpc-layer/gck-rpc-private.h | 2 |
6 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +2009-02-05 Thomas H.P. Andersen <phomes@gmail.com> + + * pkcs11/rpc-layer/gck-rpc-private.h: + * egg/tests/unit-test-symkey.c: + * egg/tests/unit-test-openssl.c: + * egg/egg-openssl.c: + * gp11/tests/gp11-test-module.c: Fix warnings from -Wold-style-declaration. + Fixes bug #570652 + 2009-02-02 Stef Walter <stef@memberwebs.com> * configure.in: Bump version number diff --git a/egg/egg-openssl.c b/egg/egg-openssl.c index 9ac1e2ae..97940934 100644 --- a/egg/egg-openssl.c +++ b/egg/egg-openssl.c @@ -352,7 +352,7 @@ egg_openssl_pem_write (const guchar *data, gsize n_data, GQuark type, * DEFINITIONS */ -const static struct { +static const struct { const gchar *desc; int algo; int mode; diff --git a/egg/tests/unit-test-openssl.c b/egg/tests/unit-test-openssl.c index 514e9b70..3e2572d5 100644 --- a/egg/tests/unit-test-openssl.c +++ b/egg/tests/unit-test-openssl.c @@ -104,7 +104,7 @@ DEFINE_TEST(write_reference) } /* 29 bytes (prime number, so block length has bad chance of matching */ -const static guchar *TEST_DATA = (guchar*)"ABCDEFGHIJKLMNOPQRSTUVWXYZ123"; +static const guchar *TEST_DATA = (guchar*)"ABCDEFGHIJKLMNOPQRSTUVWXYZ123"; const gsize TEST_DATA_L = 29; DEFINE_TEST(openssl_roundtrip) diff --git a/egg/tests/unit-test-symkey.c b/egg/tests/unit-test-symkey.c index a2b041f8..e5cbf436 100644 --- a/egg/tests/unit-test-symkey.c +++ b/egg/tests/unit-test-symkey.c @@ -47,7 +47,7 @@ DEFINE_TEARDOWN(crypto_setup) } -const static struct { +static const struct { const gchar *password; int cipher_algo; int hash_algo; diff --git a/gp11/tests/gp11-test-module.c b/gp11/tests/gp11-test-module.c index 23919b5a..b4ff426d 100644 --- a/gp11/tests/gp11-test-module.c +++ b/gp11/tests/gp11-test-module.c @@ -191,7 +191,7 @@ test_C_Finalize (CK_VOID_PTR pReserved) return CKR_OK; } -const static CK_INFO TEST_INFO = { +static const CK_INFO TEST_INFO = { { CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }, "TEST MANUFACTURER ", 0, @@ -251,7 +251,7 @@ test_C_GetSlotList (CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK_ULONG_PT return CKR_OK; } -const static CK_SLOT_INFO TEST_INFO_ONE = { +static const CK_SLOT_INFO TEST_INFO_ONE = { "TEST SLOT ", "TEST MANUFACTURER ", CKF_TOKEN_PRESENT | CKF_REMOVABLE_DEVICE, @@ -259,7 +259,7 @@ const static CK_SLOT_INFO TEST_INFO_ONE = { { 65, 165 }, }; -const static CK_SLOT_INFO TEST_INFO_TWO = { +static const CK_SLOT_INFO TEST_INFO_TWO = { "TEST SLOT ", "TEST MANUFACTURER ", CKF_REMOVABLE_DEVICE, @@ -284,7 +284,7 @@ test_C_GetSlotInfo (CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) } } -const static CK_TOKEN_INFO TEST_TOKEN_ONE = { +static const CK_TOKEN_INFO TEST_TOKEN_ONE = { "TEST LABEL ", "TEST MANUFACTURER ", "TEST MODEL ", diff --git a/pkcs11/rpc-layer/gck-rpc-private.h b/pkcs11/rpc-layer/gck-rpc-private.h index 2f0efd6f..50f2c398 100644 --- a/pkcs11/rpc-layer/gck-rpc-private.h +++ b/pkcs11/rpc-layer/gck-rpc-private.h @@ -135,7 +135,7 @@ typedef struct _GckRpcCall { * z = null terminated string */ -const static GckRpcCall gck_rpc_calls[] = { +static const GckRpcCall gck_rpc_calls[] = { { GCK_RPC_CALL_ERROR, "ERROR", NULL, NULL }, { GCK_RPC_CALL_C_Initialize, "C_Initialize", "ay", "" }, { GCK_RPC_CALL_C_Finalize, "C_Finalize", "", "" }, |