[Scummvm-cvs-logs] CVS: scummvm/common debugger.cpp,1.19,1.20

Gregory Montoir cyx at users.sourceforge.net
Mon Jan 30 11:33:07 CET 2006


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

Modified Files:
	debugger.cpp 
Log Message:
Fixed assert conditions.

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/debugger.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- debugger.cpp	18 Jan 2006 17:39:34 -0000	1.19
+++ debugger.cpp	30 Jan 2006 19:32:28 -0000	1.20
@@ -320,7 +320,7 @@
 // Variable registration function
 template <class T>
 void Debugger<T>::DVar_Register(const char *varname, void *pointer, int type, int optional) {
-	assert(_dvar_count < (int)sizeof(_dvars));
+	assert(_dvar_count < ARRAYSIZE(_dvars));
 	strcpy(_dvars[_dvar_count].name, varname);
 	_dvars[_dvar_count].type = type;
 	_dvars[_dvar_count].variable = pointer;
@@ -332,7 +332,7 @@
 // Command registration function
 template <class T>
 void Debugger<T>::DCmd_Register(const char *cmdname, DebugProc pointer) {
-	assert(_dcmd_count < (int)sizeof(_dcmds));
+	assert(_dcmd_count < ARRAYSIZE(_dcmds));
 	strcpy(_dcmds[_dcmd_count].name, cmdname);
 	_dcmds[_dcmd_count].function = pointer;
 





More information about the Scummvm-git-logs mailing list