Shut up compiler warnings

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 280

6 files changed, 48 insertions, 38 deletions

diff --git a/src/d_main.c b/src/d_main.c
index d5a89c47..91c83d71 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 277 2006-01-09 01:50:51Z fraggle $
+// $Id: d_main.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.37  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.36  2006/01/09 01:50:51  fraggle
 // Deduce a sane player name by examining environment variables.  Add
 // a "player_name" setting to chocolate-doom.cfg.  Transmit the name
@@ -163,7 +166,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 277 2006-01-09 01:50:51Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 280 2006-01-10 22:14:13Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -1172,7 +1175,6 @@ void PrintDehackedBanners(void)
 static void SetConfigDir(void)
 {
     char *homedir;
-    int i;
 
     homedir = getenv("HOME");
 
diff --git a/src/i_sound.c b/src/i_sound.c
index 127720d1..18cc0975 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_sound.c 271 2006-01-08 17:51:53Z fraggle $
+// $Id: i_sound.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.25  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.24  2006/01/08 17:51:53  fraggle
 // Add S_MusicPlaying function to query if music is still playing.
 //
@@ -119,7 +122,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: i_sound.c 271 2006-01-08 17:51:53Z fraggle $";
+rcsid[] = "$Id: i_sound.c 280 2006-01-10 22:14:13Z fraggle $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -574,8 +577,6 @@ void I_ShutdownMusic(void)
     music_initialised = false;
 }
 
-static int	looping=0;
-static int	musicdies=-1;
 static boolean  musicpaused = false;
 
 //
diff --git a/src/m_misc.c b/src/m_misc.c
index 8439fdf5..f4db1506 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_misc.c 277 2006-01-09 01:50:51Z fraggle $
+// $Id: m_misc.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -23,6 +23,9 @@
 //
 //
 // $Log$
+// Revision 1.17  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.16  2006/01/09 01:50:51  fraggle
 // Deduce a sane player name by examining environment variables.  Add
 // a "player_name" setting to chocolate-doom.cfg.  Transmit the name
@@ -95,7 +98,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_misc.c 277 2006-01-09 01:50:51Z fraggle $";
+rcsid[] = "$Id: m_misc.c 280 2006-01-10 22:14:13Z fraggle $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -616,7 +619,6 @@ void M_SaveDefaults (void)
 
 void M_LoadDefaults (void)
 {
-    char *homedir;
     int i;
  
     // check for a custom default file
diff --git a/src/mmus2mid.c b/src/mmus2mid.c
index 5e6cb5e8..2166984c 100644
--- a/src/mmus2mid.c
+++ b/src/mmus2mid.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: mmus2mid.c 255 2006-01-05 02:48:03Z fraggle $
+// $Id: mmus2mid.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 //  Copyright (C) 1999 by
@@ -27,6 +27,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.4  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.3  2006/01/05 02:48:03  fraggle
 // Fixes for big endian machines (thanks locust)
 //
@@ -651,30 +654,9 @@ int MidiToMIDI(UBYTE *mid,MIDI *mididata)
 //                  /* it also provides a MUS to MID file converter*/
 // proff: I moved this down, because I need MIDItoMidi
 
-static void FreeTracks(MIDI *mididata);
 static void TWriteLength(UBYTE **midiptr,ULONG length);
 
 //
-// FreeTracks()
-//
-// Free all track allocations in the MIDI structure
-//
-// Passed a pointer to an Allegro MIDI structure
-// Returns nothing
-//
-static void FreeTracks(MIDI *mididata)
-{
-  int i;
-
-  for (i=0; i<MIDI_TRACKS; i++)
-  {
-    free(mididata->track[i].data);
-    mididata->track[i].data = NULL;
-    mididata->track[i].len = 0;
-  }
-}
-
-//
 // TWriteLength()
 //
 // Write the length of a MIDI chunk to a midi buffer. The length is four
@@ -762,6 +744,26 @@ int MIDIToMidi(MIDI *mididata,UBYTE **mid,int *midlen)
 // proff: I moved this down, because I need MIDItoMidi
 
 //
+// FreeTracks()
+//
+// Free all track allocations in the MIDI structure
+//
+// Passed a pointer to an Allegro MIDI structure
+// Returns nothing
+//
+static void FreeTracks(MIDI *mididata)
+{
+  int i;
+
+  for (i=0; i<MIDI_TRACKS; i++)
+  {
+    free(mididata->track[i].data);
+    mididata->track[i].data = NULL;
+    mididata->track[i].len = 0;
+  }
+}
+
+//
 // main()
 //
 // Main routine that will convert a globbed set of MUS files to the
diff --git a/src/net_gui.c b/src/net_gui.c
index daa7b71a..8427554c 100644
--- a/src/net_gui.c
+++ b/src/net_gui.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: net_gui.c 278 2006-01-09 02:03:39Z fraggle $
+// $Id: net_gui.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -21,6 +21,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.7  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.6  2006/01/09 02:03:39  fraggle
 // Send clients their player number, and indicate on the waiting screen
 // which client we are.
@@ -82,7 +85,6 @@ static void Drawer(void)
 {
     patch_t *backdrop;
     int backdrop_lumpnum;
-    char buf[128];
     int i, y;
 
     // Use INTERPIC or TITLEPIC if we don't have it
diff --git a/src/w_wad.c b/src/w_wad.c
index 40cefef3..69605fa9 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: w_wad.c 167 2005-10-08 18:22:46Z fraggle $
+// $Id: w_wad.c 280 2006-01-10 22:14:13Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.9  2006/01/10 22:14:13  fraggle
+// Shut up compiler warnings
+//
 // Revision 1.8  2005/10/08 18:22:46  fraggle
 // Store the cache as part of the lumpinfo_t struct.  Add W_AddFile prototype
 // to header.
@@ -55,7 +58,7 @@
 
 
 static const char
-rcsid[] = "$Id: w_wad.c 167 2005-10-08 18:22:46Z fraggle $";
+rcsid[] = "$Id: w_wad.c 280 2006-01-10 22:14:13Z fraggle $";
 
 
 #include <ctype.h>
@@ -323,8 +326,6 @@ void W_Reload (void)
 //
 void W_InitMultipleFiles (char** filenames)
 {	
-    int		size;
-    
     // open all the files, load headers, and count lumps
     numlumps = 0;