Fixes based on feedback

Bart Roossien · Bart Roossien · commit 1d5ba5c20cd8 · 2025-10-14T15:27:38.000+02:00
diff --git a/Core/Libraries/Source/debug/CMakeLists.txt b/Core/Libraries/Source/debug/CMakeLists.txt
@@ -33,7 +33,7 @@ target_include_directories(core_debug INTERFACE
 )
 
 target_link_libraries(core_debug PRIVATE
-    core_wwcommon
     core_config
+    core_wwcommon
     corei_always
 )
diff --git a/Core/Libraries/Source/profile/CMakeLists.txt b/Core/Libraries/Source/profile/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories(core_profile INTERFACE
 )
 
 target_link_libraries(core_profile PRIVATE
-    core_wwcommon
     core_config
+    core_wwcommon
     corei_always
 )
diff --git a/Core/Libraries/Source/profile/profile_highlevel.cpp b/Core/Libraries/Source/profile/profile_highlevel.cpp
@@ -92,7 +92,7 @@ ProfileHighLevel::Block::Block(const char *name)
   m_idTime=AddProfile(name,NULL,"msec",6,-4);
 
   char help[256];
-  strlcpy(help, name, sizeof(help) - 3);
+  strlcpy(help, name, sizeof(help) - 2);
   strlcat(help, ".c", sizeof(help));
   AddProfile(help,NULL,"calls",6,0).Increment();
 
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -2283,7 +2283,7 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 			hierarchy_name_len = (int)mesh_name - (int)name;
 			mesh_name++;
 		}
-		assert( hierarchy_name_len <= W3D_NAME_LEN);
+		assert( hierarchy_name_len < W3D_NAME_LEN);
 		strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);
 		strlcpy( header.ContainerName, name, hierarchy_name_len + 1);
 	} else {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -2329,7 +2329,7 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex
 			hierarchy_name_len = (int)mesh_name - (int)name;
 			mesh_name++;
 		}
-		assert( hierarchy_name_len <= W3D_NAME_LEN);
+		assert( hierarchy_name_len < W3D_NAME_LEN);
 		strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);
 		strlcpy( header.ContainerName, name, hierarchy_name_len + 1);
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ target_include_directories(core_debug INTERFACE`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`target_link_libraries(core_debug PRIVATE`
`36`		`- core_wwcommon`
`37`	`36`	`core_config`
	`37`	`+ core_wwcommon`
`38`	`38`	`corei_always`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ target_include_directories(core_profile INTERFACE`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`target_link_libraries(core_profile PRIVATE`
`30`		`- core_wwcommon`
`31`	`30`	`core_config`
	`31`	`+ core_wwcommon`
`32`	`32`	`corei_always`
`33`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2283,7 +2283,7 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex`
`2283`	`2283`	`hierarchy_name_len = (int)mesh_name - (int)name;`
`2284`	`2284`	`mesh_name++;`
`2285`	`2285`	`}`
`2286`		`- assert( hierarchy_name_len <= W3D_NAME_LEN);`
	`2286`	`+ assert( hierarchy_name_len < W3D_NAME_LEN);`
`2287`	`2287`	`strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);`
`2288`	`2288`	`strlcpy( header.ContainerName, name, hierarchy_name_len + 1);`
`2289`	`2289`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -2329,7 +2329,7 @@ WW3DErrorType MeshModelClass::write_header(ChunkSaveClass & csave,MeshSaveContex`
`2329`	`2329`	`hierarchy_name_len = (int)mesh_name - (int)name;`
`2330`	`2330`	`mesh_name++;`
`2331`	`2331`	`}`
`2332`		`- assert( hierarchy_name_len <= W3D_NAME_LEN);`
	`2332`	`+ assert( hierarchy_name_len < W3D_NAME_LEN);`
`2333`	`2333`	`strlcpy( header.MeshName, mesh_name, W3D_NAME_LEN);`
`2334`	`2334`	`strlcpy( header.ContainerName, name, hierarchy_name_len + 1);`
`2335`	`2335`	`} else {`