gnome-keyring r1498 - in trunk: . egg egg/tests gp11/tests pkcs11/rpc-layer

[thomashpa svn gnome org]

Author: thomashpa
Date: Thu Feb  5 20:57:49 2009
New Revision: 1498
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1498&view=rev

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

Modified:
   trunk/ChangeLog
   trunk/egg/egg-openssl.c
   trunk/egg/tests/unit-test-openssl.c
   trunk/egg/tests/unit-test-symkey.c
   trunk/gp11/tests/gp11-test-module.c
   trunk/pkcs11/rpc-layer/gck-rpc-private.h

Modified: trunk/egg/egg-openssl.c
==============================================================================
--- trunk/egg/egg-openssl.c	(original)
+++ trunk/egg/egg-openssl.c	Thu Feb  5 20:57:49 2009
@@ -352,7 +352,7 @@
  * DEFINITIONS
  */
 
-const static struct {
+static const struct {
 	const gchar *desc;
 	int algo;
 	int mode;

Modified: trunk/egg/tests/unit-test-openssl.c
==============================================================================
--- trunk/egg/tests/unit-test-openssl.c	(original)
+++ trunk/egg/tests/unit-test-openssl.c	Thu Feb  5 20:57:49 2009
@@ -104,7 +104,7 @@
 }
 
 /* 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)

Modified: trunk/egg/tests/unit-test-symkey.c
==============================================================================
--- trunk/egg/tests/unit-test-symkey.c	(original)
+++ trunk/egg/tests/unit-test-symkey.c	Thu Feb  5 20:57:49 2009
@@ -47,7 +47,7 @@
 
 }
 
-const static struct {
+static const struct {
 	const gchar *password;
 	int cipher_algo;
 	int hash_algo;

Modified: trunk/gp11/tests/gp11-test-module.c
==============================================================================
--- trunk/gp11/tests/gp11-test-module.c	(original)
+++ trunk/gp11/tests/gp11-test-module.c	Thu Feb  5 20:57:49 2009
@@ -191,7 +191,7 @@
 	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 @@
 	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 @@
 	{ 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 @@
 	}
 }
 
-const static CK_TOKEN_INFO TEST_TOKEN_ONE = {
+static const CK_TOKEN_INFO TEST_TOKEN_ONE = {
 	"TEST LABEL                      ",
 	"TEST MANUFACTURER               ",
 	"TEST MODEL      ",

Modified: trunk/pkcs11/rpc-layer/gck-rpc-private.h
==============================================================================
--- trunk/pkcs11/rpc-layer/gck-rpc-private.h	(original)
+++ trunk/pkcs11/rpc-layer/gck-rpc-private.h	Thu Feb  5 20:57:49 2009
@@ -135,7 +135,7 @@
  *  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",             "",        ""                     },