Don't cast calls to malloc().

src/asm/fstack.c

@@ -66,8 +66,7 @@ pushcontext(void)
 	while (*ppFileStack)
 		ppFileStack = &((*ppFileStack)->pNext);
 
-	if ((*ppFileStack =
+	if ((*ppFileStack = malloc(sizeof(struct sContext))) != NULL) {
-		(struct sContext *) malloc(sizeof(struct sContext))) != NULL) {
 		(*ppFileStack)->FlexHandle = CurrentFlexHandle;
 		(*ppFileStack)->pNext = NULL;
 		strcpy((char *) (*ppFileStack)->tzFileName,

src/asm/lexer.c

@@ -116,11 +116,9 @@ yy_scan_bytes(char *mem, ULONG size)
 {
 	YY_BUFFER_STATE pBuffer;
 
-	if ((pBuffer =
+	if ((pBuffer = malloc(sizeof(struct yy_buffer_state))) != NULL) {
-		(YY_BUFFER_STATE) malloc(sizeof(struct yy_buffer_state))) !=
-	    NULL) {
 		if ((pBuffer->pBufferRealStart =
-			(char *) malloc(size + 1 + SAFETYMARGIN)) != NULL) {
+		    malloc(size + 1 + SAFETYMARGIN)) != NULL) {
 			pBuffer->pBufferStart = pBuffer->pBufferRealStart + SAFETYMARGIN;
 			pBuffer->pBuffer = pBuffer->pBufferRealStart + SAFETYMARGIN;
 			memcpy(pBuffer->pBuffer, mem, size);
@@ -139,8 +137,7 @@ yy_create_buffer(FILE * f)
 {
 	YY_BUFFER_STATE pBuffer;
 
-	if ((pBuffer =
+	if ((pBuffer = malloc(sizeof(struct yy_buffer_state))) != NULL) {
-		(YY_BUFFER_STATE) malloc(sizeof(struct yy_buffer_state))) != NULL) {
 		ULONG size;
 
 		fseek(f, 0, SEEK_END);
@@ -148,7 +145,7 @@ yy_create_buffer(FILE * f)
 		fseek(f, 0, SEEK_SET);
 
 		if ((pBuffer->pBufferRealStart =
-			(char *) malloc(size + 2 + SAFETYMARGIN)) != NULL) {
+			malloc(size + 2 + SAFETYMARGIN)) != NULL) {
 			char *mem;
 			ULONG instring = 0;
 
@@ -344,9 +341,7 @@ lex_AddStrings(struct sLexInitString * lex)
 		while (*ppHash)
 			ppHash = &((*ppHash)->pNext);
 
-		if (((*ppHash) =
+		if (((*ppHash) = malloc(sizeof(struct sLexString))) != NULL) {
-			(struct sLexString *) malloc(sizeof(struct sLexString))) !=
-		    NULL) {
 			if (((*ppHash)->tzName =
 				(char *) strdup(lex->tzName)) != NULL) {
 				(*ppHash)->nNameLength = strlen(lex->tzName);

src/asm/main.c

@@ -173,9 +173,7 @@ opt_Push(void)
 {
 	struct sOptionStackEntry *pOpt;
 
-	if ((pOpt =
+	if ((pOpt = malloc(sizeof(struct sOptionStackEntry))) != NULL) {
-		(struct sOptionStackEntry *)
-		malloc(sizeof(struct sOptionStackEntry))) != NULL) {
 		pOpt->Options = CurrentOptions;
 		pOpt->pNext = pOptionStack;
 		pOptionStack = pOpt;

src/asm/output.c

@@ -77,9 +77,7 @@ out_PushSection(void)
 {
 	struct SectionStackEntry *pSect;
 
-	if ((pSect =
+	if ((pSect = malloc(sizeof(struct SectionStackEntry))) != NULL) {
-		(struct SectionStackEntry *)
-		malloc(sizeof(struct SectionStackEntry))) != NULL) {
 		pSect->pSection = pCurrentSection;
 		pSect->pNext = pSectionStack;
 		pSectionStack = pSect;
@@ -343,9 +341,7 @@ addsymbol(struct sSymbol * pSym)
 		ppPSym = &((*ppPSym)->pBucketNext);
 	}
 
-	if ((*ppPSym = pPSym =
+	if ((*ppPSym = pPSym = malloc(sizeof(struct PatchSymbol))) != NULL) {
-		(struct PatchSymbol *) malloc(sizeof(struct PatchSymbol))) !=
-	    NULL) {
 		pPSym->pNext = NULL;
 		pPSym->pBucketNext = NULL;
 		pPSym->pSymbol = pSym;
@@ -393,8 +389,7 @@ allocpatch(void)
 {
 	struct Patch *pPatch;
 
-	if ((pPatch =
+	if ((pPatch = malloc(sizeof(struct Patch))) != NULL) {
-		(struct Patch *) malloc(sizeof(struct Patch))) != NULL) {
 		pPatch->pNext = pCurrentSection->pPatches;
 		pPatch->nRPNSize = 0;
 		pPatch->pRPN = NULL;
@@ -472,7 +467,7 @@ createpatch(ULONG type, struct Expression * expr)
 			break;
 		}
 	}
-	if ((pPatch->pRPN = (UBYTE *) malloc(rpnptr)) != NULL) {
+	if ((pPatch->pRPN = malloc(rpnptr)) != NULL) {
 		memcpy(pPatch->pRPN, rpnexpr, rpnptr);
 		pPatch->nRPNSize = rpnptr;
 	}
@@ -633,11 +628,8 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org,
 		pSect = pSect->pNext;
 	}
 
-	if ((*ppSect =
+	if ((*ppSect = (pSect = malloc(sizeof(struct Section)))) != NULL) {
-		(pSect =
+		if ((pSect->pzName = malloc(strlen(pzName) + 1)) != NULL) {
-		    (struct Section *) malloc(sizeof(struct Section)))) != NULL) {
-		if ((pSect->pzName =
-			(char *) malloc(strlen(pzName) + 1)) != NULL) {
 			strcpy(pSect->pzName, pzName);
 			pSect->nType = secttype;
 			pSect->nPC = 0;
@@ -647,8 +639,7 @@ out_FindSection(char *pzName, ULONG secttype, SLONG org,
 			pSect->pPatches = NULL;
 			pPatchSymbols = NULL;
 
-			if ((pSect->tData =
+			if ((pSect->tData = malloc(SECTIONCHUNK)) != NULL) {
-				(UBYTE *) malloc(SECTIONCHUNK)) != NULL) {
 				return (pSect);
 			} else
 				fatalerror("Not enough memory for section");

src/asm/symbol.c

@@ -94,8 +94,7 @@ createsymbol(char *s)
 	while ((*ppsym) != NULL)
 		ppsym = &((*ppsym)->pNext);
 
-	if (((*ppsym) =
+	if (((*ppsym) = malloc(sizeof(struct sSymbol))) != NULL) {
-		(struct sSymbol *) malloc(sizeof(struct sSymbol))) != NULL) {
 		strcpy((*ppsym)->tzName, s);
 		(*ppsym)->nValue = 0;
 		(*ppsym)->nType = 0;
@@ -570,8 +569,7 @@ sym_AddString(char *tzSym, char *tzValue)
 		nsym = createsymbol(tzSym);
 
 	if (nsym) {
-		if ((nsym->pMacro =
+		if ((nsym->pMacro = malloc(strlen(tzValue) + 1)) != NULL)
-			(char *) malloc(strlen(tzValue) + 1)) != NULL)
 			strcpy(nsym->pMacro, tzValue);
 		else
 			fatalerror("No memory for stringequate");

src/asm/yaccprt1.y

@@ -130,8 +130,7 @@ void	copyrept( void )
 	src=pCurrentBuffer->pBuffer;
 	ulNewMacroSize=len;
 
-	if( (tzNewMacro=(char *)malloc(ulNewMacroSize+1))!=NULL )
+	if ((tzNewMacro = malloc(ulNewMacroSize + 1)) != NULL) {
-	{
 		ULONG i;
 
 		tzNewMacro[ulNewMacroSize]=0;
@@ -140,8 +139,7 @@ void	copyrept( void )
 			if( (tzNewMacro[i]=src[i])=='\n' )
 				nLineNo+=1;
 		}
-	}
+	} else
-	else
 		fatalerror( "No mem for REPT block" );
 
 	yyskipbytes( ulNewMacroSize+4 );

src/link/assign.c

@@ -64,7 +64,6 @@ area_AllocAbs(struct sFreeArea ** ppArea, SLONG org, SLONG size)
 					struct sFreeArea *pNewArea;
 
 					if ((pNewArea =
-						(struct sFreeArea *)
 						malloc(sizeof(struct sFreeArea)))
 					    != NULL) {
 						*pNewArea = *pArea;