Revert "fix some things cppcheck found...some are TODO because i don't feel like investigating them"

This reverts commit 173575e835.

engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp

@@ -79,7 +79,7 @@ bool ConsoleCommandParserGame::performParsing(const NetworkId & track, const Str
 				if(argv.size() > 2)
 				{
 					unsigned int pid;
-					sscanf(Unicode::wideToNarrow(argv[2]).c_str(), "%u", &pid);
+					sscanf(Unicode::wideToNarrow(argv[2]).c_str(), "%d", &pid);
 					GameServerConnection * gameConn = CentralServer::getInstance().getGameServer(pid);
 					if(gameConn)
 					{

engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp

@@ -1,4 +1,4 @@
-15
+
 // ConnectionServer.cpp
 // copyright 2001 Verant Interactive
 
@@ -1577,8 +1577,7 @@ void ConnectionServer::setDone(char const *reasonfmt, ...)
 				"ConnectionServer (pid %d) shutdown, reason: %s\n",
 				static_cast<int>(Os::getProcessId()),
 				reason));
-		
-		va_end(ap);
+
 		done = true;
 	}
 }

engine/server/application/LogServer/src/shared/LogServer.cpp

@@ -151,7 +151,6 @@ void LogServer::setDone(char const *reasonfmt, ...)
 				static_cast<int>(Os::getProcessId()),
 				reason));
 
-		va_end(ap);
 		m_done = true;
 	}
 }

engine/server/application/PlanetServer/src/shared/PlanetServer.cpp

@@ -1472,8 +1472,7 @@ void PlanetServer::setDone(char const *reasonfmt, ...)
 				"PlanetServer (pid %d) shutdown, reason: %s\n",
 				static_cast<int>(Os::getProcessId()),
 				reason));
-		
-		va_end(ap);
+
 		m_done = true;
 	}
 }

engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp

@@ -336,8 +336,7 @@ void DatabaseProcess::setDone(char const *reasonfmt, ...)
 				static_cast<int>(getProcessId()),
 				static_cast<int>(Os::getProcessId()),
 				reason));
-		
-		va_end(ap);
+
 		done = true;
 	}
 }

engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp

@@ -554,7 +554,6 @@ void PlayerShipController::logMoveFail(char const *reasonFmt, ...) const
 			client->getCharacterObjectId().getValueString().c_str(),
 			client->getStationId(),
 			reason));
-	va_end(ap);
 }
 
 // ----------------------------------------------------------------------

engine/server/library/serverGame/src/shared/core/GameServer.cpp

@@ -4890,7 +4890,6 @@ void GameServer::setDone(char const *reasonfmt, ...)
 				static_cast<int>(Os::getProcessId()),
 				reason));
 
-		va_end(ap);
 		m_done = true;
 	}
 }

engine/server/library/serverScript/src/shared/JNIWrappers.cpp

@@ -78,9 +78,6 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...)
 	va_start(marker, constructorID);
 
 	LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->NewObjectV(clazz, constructorID, marker)));
-
-	va_end(marker);
-	
 	if (result->getValue() == 0)
 		return LocalRef::cms_nullPtr;
 	return result;
@@ -190,11 +187,8 @@ LocalRefPtr callObjectMethod(const LocalRefParam & object, jmethodID methodID, .
 	{
 		va_list marker;
 		va_start(marker, methodID);
-	
-		LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)));
 
-		va_end(marker);
-		
+		LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)));
 		if (result->getValue() != 0)
 			return result;
 	}
@@ -211,9 +205,6 @@ LocalObjectArrayRefPtr callObjectArrayMethod(const LocalRefParam & object, jmeth
 		va_start(marker, methodID);
 
 		LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast<jobjectArray>(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))));
-
-		va_end(marker);
-
 		if (result->getValue() != 0)
 			return result;
 	}
@@ -230,9 +221,6 @@ LocalByteArrayRefPtr callByteArrayMethod(const LocalRefParam & object, jmethodID
 		va_start(marker, methodID);
 
 		LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast<jbyteArray>(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))));
-
-		va_end(marker);
-		
 		if (result->getValue() != 0)
 			return result;
 	}
@@ -248,12 +236,7 @@ jint callIntMethod(const LocalRefParam & object, jmethodID methodID, ...)
 		va_list marker;
 		va_start(marker, methodID);
 
-		//TODO: find out what type of object the below returns and get into a var so we can
-		//va_end properly
-		
 		return JavaLibrary::getEnv()->CallIntMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker); //just to make cppcheck happy
 	}
 	return 0;
 }
@@ -268,8 +251,6 @@ jlong callLongMethod(const LocalRefParam & object, jmethodID methodID, ...)
 		va_start(marker, methodID);
 
 		return JavaLibrary::getEnv()->CallLongMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker); //make cppcheck happy
 	}
 	return 0;
 }
@@ -284,8 +265,6 @@ jfloat callFloatMethod(const LocalRefParam & object, jmethodID methodID, ...)
 		va_start(marker, methodID);
 
 		return JavaLibrary::getEnv()->CallFloatMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker); //make cppcheck happy
 	}
 	return 0;
 }
@@ -300,8 +279,6 @@ jboolean callBooleanMethod(const LocalRefParam & object, jmethodID methodID, ...
 		va_start(marker, methodID);
 
 		return JavaLibrary::getEnv()->CallBooleanMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker); //make cppcheck happy
 	}
 	return JNI_FALSE;
 }
@@ -316,8 +293,6 @@ void callVoidMethod(const LocalRefParam & object, jmethodID methodID, ...)
 		va_start(marker, methodID);
 
 		JavaLibrary::getEnv()->CallVoidMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker);
 	}
 }
 
@@ -331,8 +306,6 @@ jboolean callNonvirtualBooleanMethod(const LocalRefParam & object, jclass clazz,
 		va_start(marker, methodID);
 
 		return JavaLibrary::getEnv()->CallNonvirtualBooleanMethodV(object.getValue(), clazz, methodID, marker);
-
-		va_end(marker); //make cppcheck happy
 	}
 	return JNI_FALSE;
 }
@@ -345,8 +318,6 @@ void callStaticVoidMethod(jclass clazz, jmethodID methodID, ...)
 	va_start(marker, methodID);
 
 	JavaLibrary::getEnv()->CallStaticVoidMethodV(clazz, methodID, marker);
-
-	va_end(marker);
 }
 
 //-----------------------------------------------------------------------
@@ -357,9 +328,6 @@ LocalRefPtr callStaticObjectMethod(jclass clazz, jmethodID methodID, ...)
 	va_start(marker, methodID);
 
 	LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)));
-
-	va_end(marker); //make cppcheck happy
-	
 	if (result->getValue() == 0)
 		return LocalRef::cms_nullPtr;
 	return result;
@@ -373,9 +341,6 @@ LocalObjectArrayRefPtr callStaticObjectArrayMethod(jclass clazz, jmethodID metho
 	va_start(marker, methodID);
 
 	LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast<jobjectArray>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))));
-
-	va_end(marker); 
-	
 	if (result->getValue() == 0)
 		return LocalObjectArrayRef::cms_nullPtr;
 	return result;
@@ -389,9 +354,6 @@ LocalByteArrayRefPtr callStaticByteArrayMethod(jclass clazz, jmethodID methodID,
 	va_start(marker, methodID);
 
 	LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast<jbyteArray>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))));
-
-	va_end(marker);
-	
 	if (result->getValue() == 0)
 		return LocalByteArrayRef::cms_nullPtr;
 	return result;
@@ -445,9 +407,6 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID,
 		va_start(marker, methodID);
 
 		jobject result = JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker);
-
-		va_end(marker);
-
 		if (result != 0)
 		{
 #ifdef _DEBUG
@@ -473,9 +432,6 @@ JavaStringPtr callStaticStringMethod(jclass clazz, jmethodID methodID, ...)
 
 	JavaStringPtr result(new JavaString(static_cast<jstring>(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz,
 		methodID, marker))));
-
-	va_end(marker);
-	
 	if (result->getValue() != 0)
 		return result;
 	return JavaString::cms_nullPtr;

engine/shared/library/sharedDebug/src/shared/Profiler.cpp

@@ -217,8 +217,8 @@ bool VisibleExpandableEntry::pruneInvisibleChildren()
 	for (Children::iterator i = m_children.begin(); i != m_children.end(); )
 		if ((*i)->m_visible == false)
 		{
+			delete *i;
 			m_children.erase(i);
-			delete *i;		
 		}
 		else
 			++i;

engine/shared/library/sharedFile/src/shared/FileManifest.cpp

@@ -278,9 +278,9 @@ void FileManifest::addNewManifestEntry(const char *fileName, int fileSize)
 		if (fileSize)
 			((insertReturn.first)->second)->size = fileSize;
 
+		// delete the new entry we created
+		delete entry;
 	}
-
-	delete entry;
 #else
 	return;
 #endif
@@ -299,7 +299,9 @@ void FileManifest::addStoredManifestEntry(const char *fileName, const char * sce
 
 	std::pair<ManifestMap::iterator, bool> insertReturn = s_manifest.insert(std::pair<const uint32, FileManifestEntry*>(crc, entry));
 
-	delete entry;
+	// if the insert failed, delete the entry we created
+	if (!insertReturn.second)
+		delete entry;
 }
 
 // -----------------------------------------------------------------------

engine/shared/library/sharedImage/src/shared/TargaFormat.cpp

@@ -1167,7 +1167,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename)
 	//---------------------------------------------------
 
 	f = fopen(filename, "wb");
-	if (f==NULL)
+	if (!f)
 	{
 		DEBUG_WARNING(true, ("Unable to open Targa destination file %s.\n", filename));
 		return false;

engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp

@@ -253,7 +253,7 @@ bool PaletteArgb::write(const char *pathName) const
 
 	// open file
 	FILE *const file = fopen(pathName, "wb");
-	if (file==NULL)
+	if (!file)
 	{
 		WARNING(true, ("failed to open file [%s] for writing.", pathName));
 		return false;

engine/shared/library/sharedNetwork/src/linux/NetworkGetHostName.cpp

@@ -96,7 +96,7 @@ addrList()
 				if (errno != EINVAL || lastReqSize != 0)
 				{
 					WARNING(true, ("Error getting interface list: %s", strerror(errno)));
-					delete [] buf;
+					delete buf;
 					return;
 				}
 			}

engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp

@@ -185,6 +185,4 @@ int File::print(const char *format, ...)
 	va_start(argptr, format);
 
 	return vfprintf(m_fp, format, argptr);
-
-	va_end(argptr); //make cppcheck happy
 }	// File::print

external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp

@@ -151,10 +151,10 @@ CSAssistGameAPIcore::CSAssistGameAPIcore(CSAssistGameAPI *api, const char *serve
 			m_serverList.push_back(sid);
 		}
 		//fprintf(stderr, "res=%d, p=%s, host=%s, port=%d, size=%d\n", res, p, host, port, m_serverList.size());
-		delete [] p;
+		delete p;
 	}
-	delete [] host;
-	delete [] buf;
+	delete host;
+	delete buf;
 	m_curServer = m_serverList.begin();
 	GetLBHost();
 	//