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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Nov 13 09:31:03 2009
New Revision: 443

URL: http://svn.debian.org/wsvn/muscleapps/?sc=1&rev=443
Log:
do not cast malloc() return value

Modified:
    trunk/muscleTool/muscleTool.c

Modified: trunk/muscleTool/muscleTool.c
URL: http://svn.debian.org/wsvn/muscleapps/trunk/muscleTool/muscleTool.c?rev=443&op=diff
==============================================================================
--- trunk/muscleTool/muscleTool.c (original)
+++ trunk/muscleTool/muscleTool.c Fri Nov 13 09:31:03 2009
@@ -248,7 +248,7 @@
 	MSC_RV rv = 0;
 	MSCPUChar8 tmp = NULL;
 
-	tmp = (MSCPUChar8)malloc(outSize);
+	tmp = malloc(outSize);
 	/* modulus must be larger than data */
 	if ((inSize == outSize) && (data[0] > 0x80)) {
 		goto end;
@@ -553,7 +553,7 @@
 		return;
 	}
 
-	tokenList = (MSCLPTokenInfo) malloc(sizeof(MSCTokenInfo) * tokenSize);
+	tokenList = malloc(sizeof(MSCTokenInfo) * tokenSize);
 	CHECK_ERR(tokenList == 0, "Malloc Failed");
 
 	rv = MSCListTokens(MSC_LIST_KNOWN, tokenList, &tokenSize);
@@ -583,8 +583,7 @@
 
 	if (pConnection == 0)
 	{
-		pConnection =
-			(MSCLPTokenConnection) malloc(sizeof(MSCTokenConnection));
+		pConnection = malloc(sizeof(MSCTokenConnection));
 	}
 	else
 	{
@@ -2469,7 +2468,7 @@
 	}
 
 	dataSize = fileStat.st_size;
-	objectData = (MSCPUChar8) malloc(dataSize);
+	objectData = malloc(dataSize);
 	if (!objectData)
 	{
 		printf("ERR: Malloc failed\n");
@@ -2835,9 +2834,9 @@
 		if ((((strlen(hexString) / 2) * 8) % dummySize) == 0)
 			inputBlockSize-=(dummySize/8);
 
-		inCryptData = (MSCUChar8 *)malloc(sizeof(MSCUChar8)*inputBlockSize);
+		inCryptData = malloc(sizeof(MSCUChar8)*inputBlockSize);
 		/* I assume input block length = output block length */
-		outCryptData = (MSCUChar8 *)malloc(sizeof(MSCUChar8)*inputBlockSize);
+		outCryptData = malloc(sizeof(MSCUChar8)*inputBlockSize);
 
 		inDataSize = hexToBin((MSCUChar8 *)hexString, inCryptData);
 		outDataSize = inputBlockSize;
@@ -2880,7 +2879,7 @@
 		if (((fileSize * 8) % dummySize) == 0)
 			inputBlockSize-=(dummySize/8);
 
-		inCryptData = (MSCUChar8 *)malloc(sizeof(MSCUChar8)*inputBlockSize);
+		inCryptData = malloc(sizeof(MSCUChar8)*inputBlockSize);
 		read = fread(inCryptData, sizeof(MSCUChar8), fileSize, inFile);
 		if (ferror(inFile)) {
 			printf("ERR: Error reading file\n");
@@ -2889,7 +2888,7 @@
 		inDataSize = read;
 
 		/* I assume input block length = output block length */
-		outCryptData = (MSCUChar8 *)malloc(sizeof(MSCUChar8)*inputBlockSize);
+		outCryptData = malloc(sizeof(MSCUChar8)*inputBlockSize);
 		outDataSize = inputBlockSize;
 
 		if (ciphDir == MSC_DIR_VERIFY) {
@@ -3470,7 +3469,7 @@
 	}
 
 	dataSize = fileStat.st_size;
-	objectData = (MSCPUChar8) malloc(dataSize);
+	objectData = malloc(dataSize);
 	if (!objectData)
 	{
 		printf("ERR: Malloc failed\n");
@@ -3796,8 +3795,7 @@
 		pConnection = NULL;
 	}
 
-	pConnection =
-		(MSCLPTokenConnection) malloc(sizeof(MSCTokenConnection));
+	pConnection = malloc(sizeof(MSCTokenConnection));
 
 	rv = MSCEstablishConnection(&tokenList[tokenNumber - 1],
 		MSC_SHARE_EXCLUSIVE, 0, 0, pConnection);