Fix compiler warnings from -Wold-style-declaration. Fixes bug #5706

svn path=/trunk/; revision=1498

diff --git a/egg/egg-openssl.c b/egg/egg-openssl.c
index e16a662..36e3e9e 100644 (file)
--- 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 b6685e9..db13f42 100644 (file)
--- 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 51d7ac7..f4c06eb 100644 (file)
--- 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 180540c..5dfc987 100644 (file)
--- 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      ",