[Pcsclite-cvs-commit] r457 - /trunk/muscleTool/muscleTool.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Nov 13 10:01:33 2009
New Revision: 457

URL: http://svn.debian.org/wsvn/muscleapps/?sc=1&rev=457
Log:
warning: initialization discards qualifiers from pointer target type

Modified:
    trunk/muscleTool/muscleTool.c

Modified: trunk/muscleTool/muscleTool.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/muscleTool/muscleTool.c?rev=457&op=diff
==============================================================================
--- trunk/muscleTool/muscleTool.c (original)
+++ trunk/muscleTool/muscleTool.c Fri Nov 13 10:01:33 2009
@@ -375,7 +375,7 @@
 	MSCULong32 choice;
 	MSCULong32 dummy = 256;
 	MSCUChar8 temp[256];
-	char *choices[5] = {"Serial Number", "Card Label", "ID Creation ACL",
+	const char *choices[5] = {"Serial Number", "Card Label", "ID Creation ACL",
 	"Object Creation ACL", "Key Creation ACL"};
 
 	CHECK_ERR(pConnection == 0, "Must Connect First !");
@@ -2619,16 +2619,16 @@
 	FILE *outFile = NULL;
 	int choice=0;
 
-	char *sved[4] = {"Sign", "Verify", "Encrypt", "Decrypt"};
-	char *s [1] = {"Sign"};
-	char *v [1] = {"Verify"};
-	char *sd [2] = {"Sign", "Decrypt"};
-	char *ve [2] = {"Verify", "Encrypt"};
+	const char *sved[4] = {"Sign", "Verify", "Encrypt", "Decrypt"};
+	const char *s [1] = {"Sign"};
+	const char *v [1] = {"Verify"};
+	const char *sd [2] = {"Sign", "Decrypt"};
+	const char *ve [2] = {"Verify", "Encrypt"};
 #ifndef VERSION2
-	char *ed [2] = {"Encrypt", "Decrypt"};
-#endif
-#ifdef VERSION2
-	char *desCiph [8] = {"DES in CBC mode with no padding",
+	const char *ed [2] = {"Encrypt", "Decrypt"};
+#endif
+#ifdef VERSION2
+	const char *desCiph [8] = {"DES in CBC mode with no padding",
 	"DES in ECB mode with no padding",
 	"DES in CBC mode with ISO 9797 method 1 padding",
 	"DES in CBC mode with ISO 9797 method 2 padding",
@@ -2638,30 +2638,30 @@
 	"DES in ECB mode with PKCS#5 padding"
 	};
 #else
-	char *desCiph [2] = {"DES in CBC mode with no padding",
+	const char *desCiph [2] = {"DES in CBC mode with no padding",
 	"DES in ECB mode with no padding",
 	};
 #endif
 #ifdef VERSION2
-	char *rsaCiph [5] = {"RSA with no padding",
+	const char *rsaCiph [5] = {"RSA with no padding",
 	"RSA with PKCS#1 padding",
 	"RSA with ISO 9796 padding",
 	"RSA with ISO 14888 padding",
 	"RSA with PKCS#1-OAEP padding"};
 #else
-	char *rsaCiph [2] = {"RSA with no padding",
+	const char *rsaCiph [2] = {"RSA with no padding",
   "RSA with PKCS#1 padding"};
 #endif
 
-	char *dsaSign [1] = {"DSA with SHA-1 hash"};
-#ifdef VERSION2
-	char *aesSign [1] = {"AES with blocksize 128 in CBC mode"};
-	char *aesCiph [2] = {"AES with block size 128 in CBC mode with no padding",
+	const char *dsaSign [1] = {"DSA with SHA-1 hash"};
+#ifdef VERSION2
+	const char *aesSign [1] = {"AES with blocksize 128 in CBC mode"};
+	const char *aesCiph [2] = {"AES with block size 128 in CBC mode with no padding",
 	"AES with block size 128 in ECB mode with no padding"};
-	char *ecSign [1] = {"ECDSA with SHA-1 hash"};
-#endif
-#ifdef VERSION2
-	char *rsaSign [10] = {"RSA with MD5 hash and PKCS#1 padding",
+	const char *ecSign [1] = {"ECDSA with SHA-1 hash"};
+#endif
+#ifdef VERSION2
+	const char *rsaSign [10] = {"RSA with MD5 hash and PKCS#1 padding",
 		"RSA with SHA-1 hash and PKCS#1 padding",
 		"RSA with SHA-1 hash and ISO 9796 padding",
 		"RSA with RIPE MD-160 hash and ISO 9796 padding",
@@ -2673,11 +2673,11 @@
 		"RSA with SHA-1 hash and PKCS#1-PSS padding"
 	};
 #else
-	char *rsaSign [1] = {"RSA with MD5 hash and PKCS#1 padding",
+	const char *rsaSign [1] = {"RSA with MD5 hash and PKCS#1 padding",
 	};
 #endif
 #ifdef VERSION2
-	char *desSign [10] = {"DES 4 byte MAC with no padding",
+	const char *desSign [10] = {"DES 4 byte MAC with no padding",
 		"DES 4 short MAC with ISO 9797 method 1 padding",
 		"DES 4 short MAC with ISO 9797 method 2 padding",
 		"DES 4 short MAC mode with PKCS#5 padding",
@@ -3676,7 +3676,7 @@
 	keyParams.publicKeyACL.usePermission = (MSCUShort16)pubUseACL;
 
 	{
-		char *choices[2] = {"YES", "NO"};
+		const char *choices[2] = {"YES", "NO"};
 		choice = getChoice("Are you sure ?", "Choose", choices, 2);
 	}
 
@@ -3803,7 +3803,7 @@
 	}
 #endif
 	{
-		char *choices[2] = {"Use the default key : 4D7573636C653030",
+		const char *choices[2] = {"Use the default key : 4D7573636C653030",
 		"Enter your own transport key"};
 		transportKeyChoice = getChoice("Would you like to: ", "Choose", choices, 2);
 	}
@@ -3826,7 +3826,7 @@
 
 #ifdef VERSION2
 	{
-		char *choices[2] = {"YES", "NO"};
+		const char *choices[2] = {"YES", "NO"};
 		pinPolicyChoice = getChoice("Do you want to enforce any PIN policies ?", "Choose", choices, 2);
 		if (pinPolicyChoice == 0)
 			goto abort;
@@ -3985,7 +3985,7 @@
 #ifdef VERSION2
 	/* Matheus: added card label and serial number information */
 	{
-		char *choices[2] = { "YES", "NO" };
+		const char *choices[2] = { "YES", "NO" };
 		rv = getChoice(
 					"Do you want to set the card label?\nCard label can be (re)set later by admin.\n",
 					"Choose:",
@@ -4085,7 +4085,7 @@
 
 #endif
 	{
-		char *choices[2] = {"YES", "NO"};
+		const char *choices[2] = {"YES", "NO"};
 		choice = getChoice("Is the above okay ?", "Choose", choices, 2);
 		if (choice == 0 || choice == 2)
 			goto abort;