[Scummvm-cvs-logs] scummvm master -> 263ef4549996e40cdac1ec22b4cbda8ca94b482f

digitall digitall at scummvm.org
Thu Jun 2 05:54:33 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
263ef45499 M4: Replace snprintf() usage with Common::String::format()


Commit: 263ef4549996e40cdac1ec22b4cbda8ca94b482f
    https://github.com/scummvm/scummvm/commit/263ef4549996e40cdac1ec22b4cbda8ca94b482f
Author: D G Turner (digitall at scummvm.org)
Date: 2011-06-01T20:52:34-07:00

Commit Message:
M4: Replace snprintf() usage with Common::String::format()

Safer and less portability issues.

Changed paths:
    engines/m4/globals.cpp



diff --git a/engines/m4/globals.cpp b/engines/m4/globals.cpp
index 8787f89..bf2c3ab 100644
--- a/engines/m4/globals.cpp
+++ b/engines/m4/globals.cpp
@@ -154,24 +154,24 @@ void Kernel::loadGlobalScriptFunctions() {
 }
 
 void Kernel::loadSectionScriptFunctions() {
-	char tempFnName[128];
-	snprintf(tempFnName, 128, "section_init_%d", currentSection);
+	Common::String tempFnName;
+	tempFnName = Common::String::format("section_init_%d", currentSection);
 	_sectionInitFn = _vm->_script->loadFunction(tempFnName);
-	snprintf(tempFnName, 128, "section_daemon_%d", currentSection);
+	tempFnName = Common::String::format("section_daemon_%d", currentSection);
 	_sectionDaemonFn = _vm->_script->loadFunction(tempFnName);
-	snprintf(tempFnName, 128, "section_parser_%d", currentSection);
+	tempFnName = Common::String::format("section_parser_%d", currentSection);
 	_sectionParserFn = _vm->_script->loadFunction(tempFnName);
 }
 
 void Kernel::loadRoomScriptFunctions() {
-	char tempFnName[128];
-	snprintf(tempFnName, 128, "room_init_%d", currentRoom);
+	Common::String tempFnName;
+	tempFnName = Common::String::format("room_init_%d", currentRoom);
 	_roomInitFn = _vm->_script->loadFunction(tempFnName);
-	snprintf(tempFnName, 128, "room_daemon_%d", currentRoom);
+	tempFnName = Common::String::format("room_daemon_%d", currentRoom);
 	_roomDaemonFn = _vm->_script->loadFunction(tempFnName);
-	snprintf(tempFnName, 128, "room_pre_parser_%d", currentRoom);
+	tempFnName = Common::String::format("room_pre_parser_%d", currentRoom);
 	_roomPreParserFn = _vm->_script->loadFunction(tempFnName);
-	snprintf(tempFnName, 128, "room_parser_%d", currentRoom);
+	tempFnName = Common::String::format("room_parser_%d", currentRoom);
 	_roomParserFn = _vm->_script->loadFunction(tempFnName);
 }
 






More information about the Scummvm-git-logs mailing list