144 warnings on the wall, take some down, grind them to dust, 98 warn…

…ings on the wall.

lib/framework/tagfile.cpp

@@ -388,7 +388,7 @@ static bool scan_to(element_t tag)
 	}
 	lastAccess = tag;
 	// Set the right node
-	for (; current->next && current->element < tag; current = current->next);
+	for (; current->next && current->element < tag; current = current->next) {}
 	if (current->element != tag)
 	{
 		TF_ERROR("Unknown element %#04x sought", (unsigned int)tag);

lib/ivis_common/bitimage.cpp

@@ -92,7 +92,7 @@ IMAGEFILE *iV_LoadImageFile(const char *fileName)
 		{
 			tPages = ImageDef->TPageID;
 		}
-		while (ptr < pFileData + pFileSize && *ptr++ != '\n'); // skip rest of line
+		while (ptr < pFileData + pFileSize && *ptr++ != '\n') {} // skip rest of line
 	}
 
 	dot = (char *)strrchr(fileName, '/');  // go to last path character

lib/ivis_opengl/pieblitfunc.cpp

@@ -287,8 +287,8 @@ void pie_DownLoadRadar(UDWORD *buffer, int width, int height, bool filter)
 	char *black;
 
 	/* Find power of two size */
-	while (width > (w *= 2));
-	while (height > (h *= 2));
+	while (width > (w *= 2)) {}
+	while (height > (h *= 2)) {}
 
 	pie_SetTexturePage(radarTexture);
 	black = (char *)calloc(1, w * h * 4);

lib/ivis_opengl/tex.cpp

@@ -77,7 +77,7 @@ int pie_AddTexPage(iV_Image *s, const char* filename, int slot, int maxTextureSi
 	}
 
 	/* Use first unused slot */
-	for (i = slot; i < iV_TEX_MAX && _TEX_PAGE[i].name[0] != '\0'; i++);
+	for (i = slot; i < iV_TEX_MAX && _TEX_PAGE[i].name[0] != '\0'; i++) {}
 
 	if (i == _TEX_INDEX)
 	{
@@ -208,7 +208,7 @@ void pie_MakeTexPageTCMaskName(char * filename)
 	if (strncmp(filename, "page-", 5) == 0)
 	{
 		int i;
-		for( i = 5; i < iV_TEXNAME_MAX-1 && isdigit(filename[i]); i++);
+		for ( i = 5; i < iV_TEXNAME_MAX-1 && isdigit(filename[i]); i++) {}
 		filename[i] = '\0';
 		strcat(filename, iV_TEXNAME_TCSUFFIX);
 	}

src/clparse.cpp

@@ -494,7 +494,7 @@ bool ParseCommandLine(int argc, const char** argv)
 				}
 
 				// Find an empty place in the global_mods list
-				for (i = 0; i < 100 && global_mods[i] != NULL; ++i);
+				for (i = 0; i < 100 && global_mods[i] != NULL; ++i) {}
 				if (i >= 100 || global_mods[i] != NULL)
 				{
 					debug(LOG_FATAL, "Too many mods registered! Aborting!");
@@ -516,7 +516,7 @@ bool ParseCommandLine(int argc, const char** argv)
 				}
 
 				// Find an empty place in the campaign_mods list
-				for (i = 0; i < 100 && campaign_mods[i] != NULL; ++i);
+				for (i = 0; i < 100 && campaign_mods[i] != NULL; ++i) {}
 				if (i >= 100 || campaign_mods[i] != NULL)
 				{
 					debug(LOG_FATAL, "Too many mods registered! Aborting!");
@@ -537,7 +537,7 @@ bool ParseCommandLine(int argc, const char** argv)
 					return false;
 				}
 
-				for (i = 0; i < 100 && multiplay_mods[i] != NULL; ++i);
+				for (i = 0; i < 100 && multiplay_mods[i] != NULL; ++i) {}
 				if (i >= 100 || multiplay_mods[i] != NULL)
 				{
 					debug(LOG_FATAL, "Too many mods registered! Aborting!");

src/display.cpp

@@ -2005,7 +2005,7 @@ static void dealWithLMBFeature(FEATURE* psFeature)
 		// find any construction droids. and order them to build an oil resource.
 
 		// first find the derrick.
-		for(i = 0; (i < numStructureStats) && (asStructureStats[i].type != REF_RESOURCE_EXTRACTOR); ++i);
+		for (i = 0; (i < numStructureStats) && (asStructureStats[i].type != REF_RESOURCE_EXTRACTOR); ++i) {}
 
 		if( (i < numStructureStats) &&
 			(apStructTypeLists[selectedPlayer][i] == AVAILABLE) )	// dont go any further if no derrick stat found.

src/hci.cpp

@@ -6692,7 +6692,7 @@ BOOL intAddProximityButton(PROXIMITY_DISPLAY *psProxDisp, UDWORD inc)
 	{
 		for(cnt = IDPROX_START;cnt<IDPROX_END;cnt++)
 		{							// go down the prox msgs and see if it's free.
-			for(psProxDisp2 = apsProxDisp[selectedPlayer];
+			for (psProxDisp2 = apsProxDisp[selectedPlayer];
 				psProxDisp2 &&(psProxDisp2->buttonID!=cnt) ;
 				psProxDisp2 = psProxDisp2->psNext);
 

src/keyedit.cpp

@@ -549,7 +549,7 @@ BOOL saveKeyMap(void)
 		WRITE(&psMapping->action, sizeof(KEY_ACTION)); // action
 
 		// function to map to!
-		for(count = 0;  keyMapSaveTable[count] != NULL
+		for (count = 0;  keyMapSaveTable[count] != NULL
 					 && keyMapSaveTable[count] != psMapping->function;
 			count++);
 		if(keyMapSaveTable[count] == NULL)

src/main.cpp

@@ -305,7 +305,7 @@ void addLoadedMod(const char * modname)
 	// Yes, this is an online insertion sort.
 	// I swear, for the numbers of mods this is going to be dealing with
 	// (i.e. 0 to 2), it really is faster than, say, Quicksort.
-	for (i=0; i<num_loaded_mods && strcmp(loaded_mods[i], mod)>0; i++);
+	for (i=0; i<num_loaded_mods && strcmp(loaded_mods[i], mod)>0; i++) {}
 	if (i < num_loaded_mods)
 	{
 		if (strcmp(loaded_mods[i], mod) == 0)

src/message.cpp

@@ -167,7 +167,7 @@ static inline void addMessageToList(MESSAGE *list[MAX_PLAYERS], MESSAGE *msg, UD
 			/*add it to the bottom of the list */
 
 			// Iterate to the last item in the list
-			for(psCurr = list[player]; psCurr->psNext != NULL; psCurr = psCurr->psNext);
+			for (psCurr = list[player]; psCurr->psNext != NULL; psCurr = psCurr->psNext) {}
 
 			// Append the new message to the end of the list
 			psCurr->psNext = msg;

src/multigifts.cpp

@@ -690,7 +690,7 @@ void recvMultiPlayerRandomArtifacts(NETQUEUE queue)
 		NETenum(&type);
 
 	debug(LOG_FEATURE, "receiving %u artifact(s) type: (%s)", quantity, feature_names[type]);
-	for (i = 0; i < numFeatureStats && asFeatureStats[i].subType != type; i++);
+	for (i = 0; i < numFeatureStats && asFeatureStats[i].subType != type; i++) {}
 
 	for (count = 0; count < quantity; count++)
 	{

src/multimenu.cpp

@@ -973,7 +973,7 @@ static void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset,
 				int num;
 				STRUCTURE *temp;
 				// NOTE, This tallys up *all* the structures you have. Test out via 'start with no base'.
-				for (num = 0, temp = apsStructLists[player]; temp != NULL;num++,temp = temp->psNext);
+				for (num = 0, temp = apsStructLists[player]; temp != NULL;num++,temp = temp->psNext) {}
 				//c11: Structures
 				sprintf(str, "%d", num);
 				iV_DrawText(str, x+MULTIMENU_C11, y+MULTIMENU_FONT_OSET);

src/multiplay.cpp

@@ -339,7 +339,7 @@ STRUCTURE *IdToStruct(UDWORD id,UDWORD player)
 	{
 		for(i=0;i<MAX_PLAYERS;i++)
 		{
-			for(psStr=apsStructLists[i];( (psStr != NULL) && (psStr->id != id)); psStr=psStr->psNext);
+			for (psStr=apsStructLists[i];( (psStr != NULL) && (psStr->id != id)); psStr=psStr->psNext) {}
 			if(psStr)
 			{
 				return psStr;
@@ -354,7 +354,7 @@ STRUCTURE *IdToStruct(UDWORD id,UDWORD player)
 			// feature hack, player = 9 are features
 			return NULL;
 		}
-		for(psStr=apsStructLists[player];((psStr != NULL )&&(psStr->id != id) );psStr=psStr->psNext);
+		for (psStr=apsStructLists[player];((psStr != NULL )&&(psStr->id != id) );psStr=psStr->psNext) {}
 	}
 	return psStr;
 }
@@ -370,7 +370,7 @@ FEATURE *IdToFeature(UDWORD id,UDWORD player)
 	{
 		for(i=0;i<MAX_PLAYERS;i++)
 		{
-			for(psF=apsFeatureLists[i];( (psF != NULL) && (psF->id != id)); psF=psF->psNext);
+			for(psF=apsFeatureLists[i];( (psF != NULL) && (psF->id != id)); psF=psF->psNext) {}
 			if(psF)
 			{
 				return psF;
@@ -385,7 +385,7 @@ FEATURE *IdToFeature(UDWORD id,UDWORD player)
 			// feature hack, player = 9 are features
 			return NULL;
 		}
-		for(psF=apsFeatureLists[player];((psF != NULL )&&(psF->id != id) );psF=psF->psNext);
+		for(psF=apsFeatureLists[player];((psF != NULL )&&(psF->id != id) );psF=psF->psNext) {}
 	}
 	return psF;
 }

src/scriptai.cpp

@@ -1688,7 +1688,7 @@ BOOL scrSkVtolEnableCheck(void)
 
 
 	// vtol factory
-	for(i=0;(i<numStructureStats)&&(asStructureStats[i].type != REF_VTOL_FACTORY);i++);
+	for(i=0;(i<numStructureStats)&&(asStructureStats[i].type != REF_VTOL_FACTORY);i++) {}
 	if( (i < numStructureStats) && (apStructTypeLists[player][i] == AVAILABLE) )
 	{
 		// vtol propulsion

src/terrain.cpp

@@ -1003,8 +1003,8 @@ bool initTerrain(void)
 	lightmapWidth = 1;
 	lightmapHeight = 1;
 	// determine the smallest power-of-two size we can use for the lightmap
-	while (mapWidth > (lightmapWidth <<= 1));
-	while (mapHeight > (lightmapHeight <<= 1));
+	while (mapWidth > (lightmapWidth <<= 1)) {}
+	while (mapHeight > (lightmapHeight <<= 1)) {}
 	debug(LOG_TERRAIN, "the size of the map is %ix%i", mapWidth, mapHeight);
 	debug(LOG_TERRAIN, "lightmap texture size is %ix%i", lightmapWidth, lightmapHeight);
 

src/texture.cpp

@@ -201,8 +201,8 @@ bool texLoad(const char *fileName)
 		const int yLimit = TILES_IN_PAGE_ROW * i;
 
 		// pad width and height into ^2 values
-		while (xLimit > (xSize *= 2));
-		while (yLimit > (ySize *= 2));
+		while (xLimit > (xSize *= 2)) {}
+		while (yLimit > (ySize *= 2)) {}
 
 		// Generate the empty texture buffer in VRAM
 		texPage = newPage(fileName, j, xSize, ySize, 0);