[Scummvm-cvs-logs] CVS: tools descumm-common.cpp,1.5,1.6 descumm.cpp,1.77,1.78 descumm.h,1.4,1.5 descumm6.cpp,1.116,1.117

Max Horn fingolfin at users.sourceforge.net
Mon Sep 15 09:22:06 CEST 2003


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv1397

Modified Files:
	descumm-common.cpp descumm.cpp descumm.h descumm6.cpp 
Log Message:
fixed warnings

Index: descumm-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm-common.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- descumm-common.cpp	11 Sep 2003 11:24:53 -0000	1.5
+++ descumm-common.cpp	15 Sep 2003 16:21:48 -0000	1.6
@@ -117,7 +117,7 @@
 	return indentbuf;
 }
 
-void outputLine(char *buf, int curoffs, int opcode, int indent)
+void outputLine(const char *buf, int curoffs, int opcode, int indent)
 {
 	char *s;
 

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- descumm.cpp	11 Sep 2003 11:26:40 -0000	1.77
+++ descumm.cpp	15 Sep 2003 16:21:48 -0000	1.78
@@ -656,7 +656,7 @@
 void do_expr_code(char *buf)
 {
 	int i;
-	char *s;
+	const char *s;
 	char *buf2;
 
 	char tmp[256];
@@ -1336,7 +1336,7 @@
 	}
 
 	do {
-		int opcode = get_byte();
+		opcode = get_byte();
 		if (opcode == 0xFF)
 			break;
 
@@ -1595,7 +1595,7 @@
 
 void do_varset_code(char *buf, byte opcode)
 {
-	char *s;
+	const char *s;
 
 	if ((scriptVersion <= 2)
 		&& ((opcode & 0x7F) == 0x0A
@@ -2545,7 +2545,6 @@
 		break;
 
 	case 0xAE:{
-			byte opcode;
 			if (IndyFlag)
 				opcode = 2;
 			else

Index: descumm.h
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- descumm.h	11 May 2003 22:23:11 -0000	1.4
+++ descumm.h	15 Sep 2003 16:21:48 -0000	1.5
@@ -131,7 +131,7 @@
 // Common
 //
 
-extern void outputLine(char *buf, int curoffs, int opcode, int indent);
+extern void outputLine(const char *buf, int curoffs, int opcode, int indent);
 extern bool indentBlock(unsigned int cur);
 
 extern char *strecpy(char *buf, const char *src);

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- descumm6.cpp	12 Sep 2003 19:28:48 -0000	1.116
+++ descumm6.cpp	15 Sep 2003 16:21:48 -0000	1.117
@@ -75,7 +75,7 @@
 	seComplex = 6,
 	seStackList = 7,
 	seDup = 8,
-	seNeg = 9,
+	seNeg = 9
 };
 
 enum {
@@ -693,7 +693,7 @@
 	return se;
 }
 
-StackEnt *se_complex(char *s)
+StackEnt *se_complex(const char *s)
 {
 	StackEnt *se = se_new(seComplex);
 	se->str = strdup(s);





More information about the Scummvm-git-logs mailing list