More code review feedbackFix unused buffer RoadOptionsAdjustements based on feedback

Author: Skyaero42

Core/GameEngine/Source/Common/System/Debug.cpp

@@ -392,6 +392,7 @@ void DebugInit(int flags)
 		}
 		strlcat(theLogFileNamePrev, ".txt", ARRAY_SIZE(theLogFileNamePrev));
 
+		static_assert(ARRAY_SIZE(theLogFileName) >= ARRAY_SIZE(dirbuf), "Incorrect array size");
 		strcpy(theLogFileName, dirbuf);
 		strlcat(theLogFileName, gAppPrefix, ARRAY_SIZE(theLogFileNamePrev));
 		strlcat(theLogFileName, DEBUG_FILE_NAME, ARRAY_SIZE(theLogFileNamePrev));

Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp

@@ -264,7 +264,8 @@ int HCompressedAnimClass::Load_W3D(ChunkLoadClass & cload)
    WWASSERT(HierarchyName != NULL);
    WWASSERT(aheader.HierarchyName != NULL);
    WWASSERT(sizeof(HierarchyName) >= W3D_NAME_LEN);
-   strcpy(HierarchyName,aheader.HierarchyName);
+	 static_assert(ARRAY_SIZE(HierarchyName) >= ARRAY_SIZE(aheader.HierarchyName), "Incorrect array size");
+	 strcpy(HierarchyName, aheader.HierarchyName);
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {

Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp

@@ -151,8 +151,8 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 	static_assert(ARRAY_SIZE(ModelName) >= ARRAY_SIZE(header.Name), "Incorrect array size");
 	static_assert(ARRAY_SIZE(BasePoseName) >= ARRAY_SIZE(header.HierarchyName), "Incorrect array size");
 	static_assert(ARRAY_SIZE(Name) >= ARRAY_SIZE(ModelName), "Incorrect array size");
-	strcpy(ModelName,header.Name);
-	strcpy(BasePoseName,header.HierarchyName);
+	strcpy(ModelName, header.Name);
+	strcpy(BasePoseName, header.HierarchyName);
 	strcpy(Name, ModelName);
 
 	/*

Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp

@@ -265,7 +265,7 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
-				static_assert(ARRAY_SIZE(m_currentObjectName) >= NAME_MAX_LEN, "Incorrect array size");
+				static_assert(ARRAY_SIZE(m_currentObjectName) >= ARRAY_SIZE(buffer), "Incorrect array size");
 				strcpy(m_currentObjectName, buffer);
 			}	else if (m_objectTreeView.ItemHasChildren(item.hItem)) {
 				strcpy(m_currentObjectName, "");

Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp

@@ -242,17 +242,10 @@ BOOL RoadOptions::OnInitDialog()
 	// load roads from test assets
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, ROAD_DIRECTORY);
-		int len = strlen(dirBuf);
-
-		strlcpy(findBuf, dirBuf, ARRAY_SIZE(dirBuf));
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(ROAD_DIRECTORY, "*.tga", filenameList, FALSE);
 
 		if (filenameList.size() > 0) {
 			FilenameList::iterator it = filenameList.begin();
@@ -263,7 +256,7 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) {
 					++it;
 					continue;

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp

@@ -234,7 +234,7 @@ Bool W3DBridge::load(BodyDamageType curDamageState)
 	char section[_MAX_PATH];
 	char right[_MAX_PATH];
 
-	static_assert(ARRAY_SIZE(left) >= ARRAY_SIZE(section), "Incorrect array size");
+	static_assert(ARRAY_SIZE(left) >= ARRAY_SIZE(modelName), "Incorrect array size");
 	static_assert(ARRAY_SIZE(section) >= ARRAY_SIZE(modelName), "Incorrect array size");
 	static_assert(ARRAY_SIZE(right) >= ARRAY_SIZE(modelName), "Incorrect array size");
 	strcpy(left, modelName);

GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp

@@ -265,7 +265,7 @@ BOOL PickUnitDialog::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
 			m_objectTreeView.GetItem(&item);
 			if (item.lParam >= 0) {
 				m_currentObjectIndex = item.lParam;
-				static_assert(ARRAY_SIZE(m_currentObjectName) >= NAME_MAX_LEN, "Incorrect array size");
+				static_assert(ARRAY_SIZE(m_currentObjectName) >= ARRAY_SIZE(buffer), "Incorrect array size");
 				strcpy(m_currentObjectName, buffer);
 			}	else if (m_objectTreeView.ItemHasChildren(item.hItem)) {
 				strcpy(m_currentObjectName, "");

GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp

@@ -242,17 +242,10 @@ BOOL RoadOptions::OnInitDialog()
 	// load roads from test assets
 #ifdef LOAD_TEST_ASSETS
 	{
-		char				dirBuf[_MAX_PATH];
-		char				findBuf[_MAX_PATH];
 		char				fileBuf[_MAX_PATH];
 
-		strcpy(dirBuf, ROAD_DIRECTORY);
-		int len = strlen(dirBuf);
-
-		strlcpy(findBuf, dirBuf, ARRAY_SIZE(dirBuf));
-
 		FilenameList filenameList;
-		TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.tga"), filenameList, FALSE);
+		TheFileSystem->getFileListInDirectory(ROAD_DIRECTORY, "*.tga", filenameList, FALSE);
 
 		if (filenameList.size() > 0) {
 			FilenameList::iterator it = filenameList.begin();
@@ -263,7 +256,7 @@ BOOL RoadOptions::OnInitDialog()
 					++it;
 					continue;
 				}
-				len = filename.getLength();
+				int len = filename.getLength();
 				if (len<5) {
 					++it;
 					continue;