[Scummvm-cvs-logs] CVS: tools queenrebuild.c,1.10,1.11 simon2mp3.c,1.30,1.31

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17258

Modified Files:
	queenrebuild.c simon2mp3.c 
Log Message:
Fix an off-by-one arrays size bug, and work around a bug in the IRIX linker (from patch #924682)

Index: queenrebuild.c
===================================================================
RCS file: /cvsroot/scummvm/tools/queenrebuild.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- queenrebuild.c	22 Feb 2004 12:54:27 -0000	1.10
+++ queenrebuild.c	28 Mar 2004 16:37:23 -0000	1.11
@@ -75,7 +75,7 @@
 };
 
 struct {
-	char filename[12];
+	char filename[13];
 	uint8 bundle;
 	uint32 offset;
 	uint32 size;

Index: simon2mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/simon2mp3.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- simon2mp3.c	22 Feb 2004 12:54:27 -0000	1.30
+++ simon2mp3.c	28 Mar 2004 16:37:23 -0000	1.31
@@ -21,9 +21,9 @@
 
 #include "extract.h"
 
-char infile_base[256];
+static char infile_base[256];
 
-void end(void)
+static void end(void)
 {
 	int size;
 	char fbuf[2048];
@@ -75,7 +75,7 @@
 }
 
 	
-int get_offsets(uint32 filenums[], uint32 offsets[])
+static int get_offsets(uint32 filenums[], uint32 offsets[])
 {
 	int i;
 	char buf[8];
@@ -91,7 +91,7 @@
 	}
 }
 
-int get_offsets_mac(uint32 filenums[], uint32 offsets[])
+static int get_offsets_mac(uint32 filenums[], uint32 offsets[])
 {
 	int i, size;
 	fseek(input, 0, SEEK_END);
@@ -106,7 +106,7 @@
 }
 
 
-uint32 get_sound(uint32 offset)
+static uint32 get_sound(uint32 offset)
 {
 	FILE *f;
 	uint32 tot_size;
@@ -142,7 +142,7 @@
 	return(tot_size);
 }
 
-void showhelp(char *exename)
+static void showhelp(char *exename)
 {
 	printf("\nUsage: %s <params> [<file> | mac]\n", exename);
 
@@ -182,7 +182,7 @@
 }
 
 
-void convert_pc(char *infile)
+static void convert_pc(char *infile)
 {
 	int i, n, size, num;
 	char tmp[256];
@@ -233,7 +233,7 @@
 	}
 }
 
-void convert_mac(void)
+static void convert_mac(void)
 {
 	int i, size, num;
 	char tmp[256];