From 94030de6caafc4e402052ea824d75fb9d9162385 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 26 Nov 2014 23:13:33 -0800
Subject: [PATCH] fix warnings

---
 arch/linux/ukali.c |  2 +-
 libmve/decoder16.c |  2 +-
 main/ai.c          |  2 +-
 main/console.c     |  2 +-
 main/gamerend.c    | 10 +++++-----
 main/network.c     |  2 +-
 main/object.c      |  4 ----
 main/render.c      |  4 ----
 main/scores.c      |  2 +-
 9 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/arch/linux/ukali.c b/arch/linux/ukali.c
index 4b38e511..5f8d6e89 100644
--- a/arch/linux/ukali.c
+++ b/arch/linux/ukali.c
@@ -68,7 +68,7 @@ int knix_Recv(int hand, char *data, int len) {
 
 	tlen = sizeof(taddr);
 
-	return recvfrom(hand, data, len, 0, (struct sockaddr *)&taddr, &tlen);
+	return recvfrom(hand, data, len, 0, (struct sockaddr *)&taddr, (unsigned int *)&tlen);
 
 }
 
diff --git a/libmve/decoder16.c b/libmve/decoder16.c
index 4cc1dea4..d72ca982 100644
--- a/libmve/decoder16.c
+++ b/libmve/decoder16.c
@@ -75,7 +75,7 @@ void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, un
     }
 
     if ((length-(pData-pOrig)) != 0) {
-    	fprintf(stderr, "DEBUG: junk left over: %d,%d,%d\n", (pData-pOrig), length, (length-(pData-pOrig)));
+        fprintf(stderr, "DEBUG: junk left over: %ld,%d,%ld\n", (pData-pOrig), length, (length-(pData-pOrig)));
     }
 }
 
diff --git a/main/ai.c b/main/ai.c
index f245266f..128d26f6 100644
--- a/main/ai.c
+++ b/main/ai.c
@@ -1261,7 +1261,7 @@ _exit_cheat:
 
 	// - -  - -  - -  - -  - -  - -  - -  - -  - -  - -  - -  - -  - -  - -  -
 	// If new state = fire, then set all gun states to fire.
-	if ((aip->GOAL_STATE == AIS_FIRE) ) {
+	if ( aip->GOAL_STATE == AIS_FIRE ) {
 		int i,num_guns;
 		num_guns = Robot_info[obj->id].n_guns;
 		for (i=0; i<num_guns; i++)
diff --git a/main/console.c b/main/console.c
index 71974ac3..7823d979 100644
--- a/main/console.c
+++ b/main/console.c
@@ -183,7 +183,7 @@ void con_printf(int priority, char *fmt, ...)
 			while (*p1);
 			*p2 = 0;
 
-			printf(buffer);
+			printf("%s", buffer);
 		}
 	}
 }
diff --git a/main/gamerend.c b/main/gamerend.c
index 0cafa3d2..6b269b60 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -335,7 +335,7 @@ void game_draw_hud_stuff()
 				sprintf (message, " ");
 			}
 		} else 
-			sprintf (message, TXT_DEMO_RECORDING);
+			sprintf (message, "%s", TXT_DEMO_RECORDING);
 
 		gr_set_curfont( GAME_FONT );    //GAME_FONT );
 		gr_set_fontcolor(gr_getcolor(27,0,0), -1 );
@@ -387,12 +387,12 @@ mprintf((0,"line_spacing=%d ",line_spacing));
 	if (r_framerate.value)
 		show_framerate();
 
-	if ( (Newdemo_state == ND_STATE_PLAYBACK) )
+	if ( Newdemo_state == ND_STATE_PLAYBACK )
 		Game_mode = Newdemo_game_mode;
 
 	draw_hud();
 
-	if ( (Newdemo_state == ND_STATE_PLAYBACK) )
+	if ( Newdemo_state == ND_STATE_PLAYBACK )
 		Game_mode = GM_NORMAL;
 
 	if ( Player_is_dead )
@@ -1028,12 +1028,12 @@ void game_render_frame_mono(void)
 
 	if (Cockpit_mode==CM_FULL_COCKPIT || Cockpit_mode==CM_STATUS_BAR) {
 
-		if ( (Newdemo_state == ND_STATE_PLAYBACK) )
+		if ( Newdemo_state == ND_STATE_PLAYBACK )
 			Game_mode = Newdemo_game_mode;
 
 		render_gauges();
 
-		if ( (Newdemo_state == ND_STATE_PLAYBACK) )
+		if ( Newdemo_state == ND_STATE_PLAYBACK )
 			Game_mode = GM_NORMAL;
 	}
 
diff --git a/main/network.c b/main/network.c
index 4d0e582f..b2401d9a 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1766,7 +1766,7 @@ void
 network_send_endlevel_sub(int player_num)
 {
 	endlevel_info end;
-	int i, j;
+	int i, j = 0;
 
 	// Send an endlevel packet for a player
 	end.type                = PID_ENDLEVEL;
diff --git a/main/object.c b/main/object.c
index 57324d6a..7506f6d4 100644
--- a/main/object.c
+++ b/main/object.c
@@ -1983,11 +1983,7 @@ void object_move_one( object * obj )
 
 		default:
 
-#ifdef __DJGPP__
 			Error("Unknown control type %d in object %li, sig/type/id = %i/%i/%i",obj->control_type, obj-Objects, obj->signature, obj->type, obj->id);
-#else
-			Error("Unknown control type %d in object %i, sig/type/id = %i/%i/%i",obj->control_type, obj-Objects, obj->signature, obj->type, obj->id);
-#endif
 
 			break;
 
diff --git a/main/render.c b/main/render.c
index 2c059d57..1215c73f 100644
--- a/main/render.c
+++ b/main/render.c
@@ -625,11 +625,7 @@ im_so_ashamed: ;
 				}
 
 			} else
-#ifdef __DJGPP__
 				Error("Illegal side type in render_side, type = %i, segment # = %li, side # = %i\n", sidep->type, segp-Segments, sidenum);
-#else
-				Error("Illegal side type in render_side, type = %i, segment # = %i, side # = %i\n", sidep->type, segp-Segments, sidenum);
-#endif
 		}
 	}
 
diff --git a/main/scores.c b/main/scores.c
index 539b0d11..c9d17bc0 100644
--- a/main/scores.c
+++ b/main/scores.c
@@ -124,7 +124,7 @@ void scores_read()
 		int i;
 
 	 	// No error message needed, code will work without a scores file
-		sprintf( Scores.cool_saying, COOL_SAYING );
+		sprintf( Scores.cool_saying, "%s", COOL_SAYING );
 		sprintf( Scores.stats[0].name, "Parallax" );
 		sprintf( Scores.stats[1].name, "Matt" );
 		sprintf( Scores.stats[2].name, "Mike" );
-- 
2.39.2