Ditching const for ARRAY_SIZE

Author: Bart Roossien

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

@@ -2974,10 +2974,9 @@ void MemoryPoolFactory::memoryPoolUsageReport( const char* filename, FILE *appen
 
 	if( !appendToFileInstead )
 	{
-		const int tmpSize = 256;
-		char tmp[tmpSize];
+		char tmp[256];
 		strcpy(tmp,filename);
-		strlcat(tmp,".csv", tmpSize);
+		strlcat(tmp,".csv", ARRAY_SIZE(tmp));
 		perfStatsFile = fopen(tmp, "w");
 	}
 	else
@@ -3202,13 +3201,12 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 		DEBUG_LOG(("------------------------------------------"));
 		DEBUG_LOG(("Begin Block Report for %s", nm));
 		DEBUG_LOG(("------------------------------------------"));
-		const int bufSize = 256;
-		char buf[bufSize] = "";
-		if (flags & _REPORT_CP_ALLOCATED_BEFORE) strlcat(buf, "AllocBefore ", bufSize);
-		if (flags & _REPORT_CP_ALLOCATED_BETWEEN) strlcat(buf, "AllocBetween ", bufSize);
-		if (flags & _REPORT_CP_FREED_BEFORE) strlcat(buf, "FreedBefore ", bufSize);
-		if (flags & _REPORT_CP_FREED_BETWEEN) strlcat(buf, "FreedBetween ", bufSize);
-		if (flags & _REPORT_CP_FREED_NEVER) strlcat(buf, "StillExisting ", bufSize);
+		char buf[256] = "";
+		if (flags & _REPORT_CP_ALLOCATED_BEFORE) strlcat(buf, "AllocBefore ", ARRAY_SIZE(buf));
+		if (flags & _REPORT_CP_ALLOCATED_BETWEEN) strlcat(buf, "AllocBetween ", ARRAY_SIZE(buf));
+		if (flags & _REPORT_CP_FREED_BEFORE) strlcat(buf, "FreedBefore ", ARRAY_SIZE(buf));
+		if (flags & _REPORT_CP_FREED_BETWEEN) strlcat(buf, "FreedBetween ", ARRAY_SIZE(buf));
+		if (flags & _REPORT_CP_FREED_NEVER) strlcat(buf, "StillExisting ", ARRAY_SIZE(buf));
 		DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)",startCheckpoint,endCheckpoint,buf));
 		DEBUG_LOG(("------------------------------------------"));
 

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

@@ -558,8 +558,7 @@ static const char * Make_W3D_Filename (const char *w3d_name)
 
 	// Copy the w3d name into a static buffer, turn it into lowercase
 	// letters, and append a ".w3d" file extension. That's the filename.
-	static const int bufferSize = 64;
-	static char buffer[bufferSize];
+	static char buffer[64];
 	if (*w3d_name == 0)
 	{
 		// Empty W3D name case.
@@ -571,6 +570,6 @@ static const char * Make_W3D_Filename (const char *w3d_name)
 	if (dot)
 		*dot = 0;
 	strlwr(buffer);
-	strlcat(buffer, ".w3d", bufferSize);
+	strlcat(buffer, ".w3d", ARRAY_SIZE(buffer));
 	return buffer;
 }

Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP

@@ -1709,8 +1709,7 @@ HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName, LPCSTR szRegistryRo
 	FILE * testfp;
 	HKEY hkey;
 	unsigned char regfilename[ 256 ];
-	const int regkeySize = 512;
-	char regkey[ regkeySize ];
+	char regkey[ 512 ];
 	unsigned long t1, t2;
 
 	if( ( szRegistryRoot == NULL ) || ( szLocalFileName == NULL ) )
@@ -1724,11 +1723,11 @@ HRESULT  Cftp::FileRecoveryPosition( LPCSTR szLocalFileName, LPCSTR szRegistryRo
 	strcpy( regkey, szRegistryRoot );
 	if( regkey[ strlen( regkey ) - 1 ] != '\\' )
 	{
-		strlcat( regkey, "\\Download", regkeySize);
+		strlcat(regkey, "\\Download", ARRAY_SIZE(regkey));
 	}
 	else
 	{
-		strlcat( regkey, "Download", regkeySize);
+		strlcat(regkey, "Download", ARRAY_SIZE(regkey));
 	}
 
 	if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, (LPCTSTR)regkey,

Core/Libraries/Source/WWVegas/WWLib/Except.cpp

@@ -340,8 +340,7 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 	/*
 	** Scrap buffer for constructing dump strings
 	*/
-	const int scrapSize = 256;
-	char scrap [scrapSize];
+	char scrap [256];
 
 	/*
 	** Clear out the dump buffer
@@ -654,15 +653,15 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 
 	for (int c = 0 ; c < 32 ; c++) {
 		if (IsBadReadPtr(eip_ptr, 1)) {
-			strlcat(scrap, "?? ", scrapSize);
+			strlcat(scrap, "?? ", ARRAY_SIZE(scrap));
 		} else {
 			sprintf(bytestr, "%02X ", *eip_ptr);
-			strlcat(scrap, bytestr, scrapSize);
+			strlcat(scrap, bytestr, ARRAY_SIZE(scrap));
 		}
 		eip_ptr++;
 	}
 
-	strlcat(scrap, "\r\n\r\n", scrapSize);
+	strlcat(scrap, "\r\n\r\n", ARRAY_SIZE(scrap));
 	Add_Txt(scrap);
 
 	/*
@@ -678,14 +677,14 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 			** The stack contents cannot be read so just print up question marks.
 			*/
 			sprintf(scrap, "%p: ", static_cast<void*>(stackptr));
-			strlcat(scrap, "????????\r\n", scrapSize);
+			strlcat(scrap, "????????\r\n", ARRAY_SIZE(scrap));
 		} else {
 			/*
 			** If this stack address is in our memory space then try to match it with a code symbol.
 			*/
 			if (IsBadCodePtr((FARPROC)*stackptr)) {
 				sprintf(scrap, "%p: %08lX ", static_cast<void*>(stackptr), *stackptr);
-				strlcat(scrap, "DATA_PTR\r\n", scrapSize);
+				strlcat(scrap, "DATA_PTR\r\n", ARRAY_SIZE(scrap));
 			} else {
 				sprintf(scrap, "%p: %08lX", static_cast<void*>(stackptr), *stackptr);
 
@@ -698,12 +697,12 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 					if (_SymGetSymFromAddr != NULL && _SymGetSymFromAddr (GetCurrentProcess(), *stackptr, &displacement, symptr)) {
 						char symbuf[256];
 						sprintf(symbuf, " - %s + %08X", symptr->Name, displacement);
-						strlcat(scrap, symbuf, scrapSize);
+						strlcat(scrap, symbuf, ARRAY_SIZE(scrap));
 					}
 				} else {
-					strlcat(scrap, " *", scrapSize);
+					strlcat(scrap, " *", ARRAY_SIZE(scrap));
 				}
-				strlcat(scrap, "\r\n", scrapSize);
+				strlcat(scrap, "\r\n", ARRAY_SIZE(scrap));
 			}
 		}
 		Add_Txt(scrap);

Core/Libraries/Source/WWVegas/WWLib/registry.cpp

@@ -367,8 +367,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 {
 	int index = 0;
 	long result = ERROR_SUCCESS;
-	const int saveNameSize = 512;
-	char save_name[saveNameSize];
+	char save_name[512];
 
 	while (result == ERROR_SUCCESS) {
 		unsigned long type = 0;
@@ -387,7 +386,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_DWORD:
 					strcpy(save_name, "DWORD_");
-					strlcat(save_name, value_name, saveNameSize);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_Int(path, save_name, *((unsigned long*)data));
 					break;
 
@@ -396,7 +395,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_SZ:
 					strcpy(save_name, "STRING_");
-					strlcat(save_name, value_name, saveNameSize);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_String(path, save_name, (char*)data);
 					break;
 
@@ -405,7 +404,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				*/
 				case REG_BINARY:
 					strcpy(save_name, "BIN_");
-					strlcat(save_name, value_name, saveNameSize);
+					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_UUBlock(path, save_name, (char*)data, data_size);
 					break;
 
@@ -470,11 +469,10 @@ void RegistryClass::Save_Registry_Tree(char *path, INIClass *ini)
 				/*
 				** See if there are sub keys.
 				*/
-				const int newKeyPathSize = 512;
-				char new_key_path[newKeyPathSize];
+				char new_key_path[512];
 				strcpy(new_key_path, path);
-				strlcat(new_key_path, "\\", newKeyPathSize);
-				strlcat(new_key_path, name, newKeyPathSize);
+				strlcat(new_key_path, "\\", ARRAY_SIZE(new_key_path));
+				strlcat(new_key_path, name, ARRAY_SIZE(new_key_path));
 
 				unsigned long num_subs = 0;
 				unsigned long num_values = 0;
@@ -553,8 +551,7 @@ void RegistryClass::Load_Registry(const char *filename, char *old_path, char *ne
 		ini.Load(file);
 
 		int old_path_len = strlen(old_path);
-		const int pathSize = 1024;
-		char path[pathSize];
+		char path[1024];
 		char string[1024];
 		unsigned char buffer[8192];
 
@@ -570,7 +567,7 @@ void RegistryClass::Load_Registry(const char *filename, char *old_path, char *ne
 			strcpy(path, new_path);
 			char *cut = strstr(section_name, old_path);
 			if (cut) {
-				strlcat(path, cut + old_path_len, pathSize);
+				strlcat(path, cut + old_path_len, ARRAY_SIZE(path));
 			}
 
 			/*
@@ -695,11 +692,10 @@ void RegistryClass::Delete_Registry_Tree(char *path)
 					/*
 					** See if there are sub keys.
 					*/
-					const int newKeyPathSize = 512;
-					char new_key_path[newKeyPathSize];
+					char new_key_path[512];
 					strcpy(new_key_path, path);
-					strlcat(new_key_path, "\\", newKeyPathSize);
-					strlcat(new_key_path, name, newKeyPathSize);
+					strlcat(new_key_path, "\\", ARRAY_SIZE(new_key_path));
+					strlcat(new_key_path, name, ARRAY_SIZE(new_key_path));
 
 					unsigned long num_subs = 0;
 					unsigned long num_values = 0;

Core/Libraries/Source/debug/debug_debug.cpp

@@ -347,7 +347,7 @@ bool Debug::AssertDone(void)
                         "time being (stops logging this assertion as well).";
     char *help=(char *)DebugAllocMemory(ioBuffer[curType].used+strlen(addInfo)+1);
     strcpy(help,ioBuffer[curType].buffer+82);
-    strlcat(help,addInfo, sizeof(help));
+    strlcat(help, addInfo, sizeof(help));
 
     // First hit? Then do a stack trace
     if (curFrameEntry->hits==1)