[Scummvm-cvs-logs] scummvm master -> 6716fa39a6fb2a3925576288c256688c5aadd7e9

eriktorbjorn eriktorbjorn at telia.com
Wed Jun 26 21:35:40 CEST 2013


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:
6716fa39a6 HOPKINS: Change some variable names for consistency


Commit: 6716fa39a6fb2a3925576288c256688c5aadd7e9
    https://github.com/scummvm/scummvm/commit/6716fa39a6fb2a3925576288c256688c5aadd7e9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-06-26T12:33:30-07:00

Commit Message:
HOPKINS: Change some variable names for consistency

This silences a GCC warning about a 'saveFile' variable shadowing
a saveFile() method.

Changed paths:
    engines/hopkins/saveload.cpp



diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index fd36480..98fb150 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -43,12 +43,12 @@ SaveLoadManager::SaveLoadManager(HopkinsEngine *vm) {
 }
 
 bool SaveLoadManager::save(const Common::String &file, const void *buf, size_t n) {
-	Common::OutSaveFile *f = g_system->getSavefileManager()->openForSaving(file);
+	Common::OutSaveFile *savefile = g_system->getSavefileManager()->openForSaving(file);
 
-	if (f) {
-		size_t bytesWritten = f->write(buf, n);
-		f->finalize();
-		delete f;
+	if (savefile) {
+		size_t bytesWritten = savefile->write(buf, n);
+		savefile->finalize();
+		delete savefile;
 
 		return bytesWritten == n;
 	} else
@@ -69,13 +69,13 @@ void SaveLoadManager::initSaves() {
 }
 
 void SaveLoadManager::load(const Common::String &file, byte *buf) {
-	Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(file);
-	if (f == NULL)
-		error("Error openinig file - %s", file.c_str());
+	Common::InSaveFile *savefile = g_system->getSavefileManager()->openForLoading(file);
+	if (savefile == NULL)
+		error("Error opening file - %s", file.c_str());
 
-	int32 filesize = f->size();
-	f->read(buf, filesize);
-	delete f;
+	int32 filesize = savefile->size();
+	savefile->read(buf, filesize);
+	delete savefile;
 }
 
 bool SaveLoadManager::readSavegameHeader(Common::InSaveFile *in, hopkinsSavegameHeader &header) {
@@ -215,13 +215,13 @@ Common::Error SaveLoadManager::loadGame(int slot) {
 
 bool SaveLoadManager::readSavegameHeader(int slot, hopkinsSavegameHeader &header) {
 	// Try and open the save file for reading
-	Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(
+	Common::InSaveFile *savefile = g_system->getSavefileManager()->openForLoading(
 		_vm->generateSaveName(slot));
-	if (!saveFile)
+	if (!savefile)
 		return false;
 
-	bool result = readSavegameHeader(saveFile, header);
-	delete saveFile;
+	bool result = readSavegameHeader(savefile, header);
+	delete savefile;
 	return result;
 }
 






More information about the Scummvm-git-logs mailing list