CVar::InfoString(): use std::string

Author: VReaperV

src/engine/client/cl_main.cpp

@@ -1507,7 +1507,7 @@ void CL_Clientinfo_f()
 	Log::Notice( "state: %s", Util::enum_str(cls.state));
 	Log::Notice( "Server: %s", cls.servername );
 	Log::Notice("User info settings:" );
-	Info_Print( Cvar_InfoString( CVAR_USERINFO, false ) );
+	Info_Print( Cvar_InfoString( CVAR_USERINFO ).c_str() );
 	Log::Notice("--------------------------------------" );
 }
 
@@ -1989,7 +1989,7 @@ void CL_CheckUserinfo()
 	if ( cvar_modifiedFlags & CVAR_USERINFO )
 	{
 		cvar_modifiedFlags &= ~CVAR_USERINFO;
-		CL_AddReliableCommand( va( "userinfo %s", Cmd_QuoteString( Cvar_InfoString( CVAR_USERINFO, false ) ) ) );
+		CL_AddReliableCommand( va( "userinfo %s", Cmd_QuoteString( Cvar_InfoString( CVAR_USERINFO ).c_str() ) ) );
 	}
 }
 

src/engine/framework/CvarSystem.cpp

@@ -547,21 +547,20 @@ namespace Cvar {
         return result.str();
     }
 
-    char* InfoString(int flag, bool big) {
-        static char info[BIG_INFO_STRING];
-        info[0] = 0;
+    std::string InfoString(int flag) {
+        std::string out;
 
         CvarMap& cvars = GetCvarMap();
 
         for (auto& entry : cvars) {
             cvarRecord_t* cvar = entry.second;
 
             if (cvar->flags & flag) {
-                Info_SetValueForKey(info, entry.first.c_str(), cvar->value.c_str(), big);
+                out += entry.first + "\\" + cvar->value;
             }
         }
 
-        return info;
+        return out;
     }
 
     void PopulateInfoMap(int flag, InfoMap& map) {

src/engine/framework/CvarSystem.h

@@ -87,7 +87,7 @@ namespace Cvar {
     cvar_t* FindCCvar(const std::string& cvarName);
     std::string GetCvarConfigText();
 	// DEPRECATED: Use PopulateInfoMap
-    char* InfoString(int flag, bool big);
+    std::string InfoString(int flag);
 	void PopulateInfoMap(int flag, InfoMap& map);
     void SetValueCProxy(const std::string& cvarName, const std::string& value);
 

src/engine/qcommon/cvar.cpp

@@ -164,6 +164,6 @@ void Cvar_WriteVariables( fileHandle_t f )
 Cvar_InfoString
 =====================
 */
-char* Cvar_InfoString(int flag, bool big) {
-    return Cvar::InfoString(flag, big);
+std::string Cvar_InfoString(int flag) {
+    return Cvar::InfoString(flag);
 }

src/engine/qcommon/cvar.h

@@ -97,7 +97,7 @@ void Cvar_WriteVariables(fileHandle_t f);
  * returns an info string containing all the cvars that have the given bit set
  * in their flags ( CVAR_USERINFO, CVAR_SERVERINFO, CVAR_SYSTEMINFO, etc )
  */
-char *Cvar_InfoString(int bit, bool big);
+std::string Cvar_InfoString(int bit);
 
 /**
  *  whenever a cvar is modified, its flags will be OR'd into this, so

src/engine/server/sv_ccmds.cpp

@@ -365,7 +365,7 @@ static void SV_Serverinfo_f()
 	}
 
 	Log::Notice( "Server info settings:" );
-	Info_Print( Cvar_InfoString( CVAR_SERVERINFO, false ) );
+	Info_Print( Cvar_InfoString( CVAR_SERVERINFO ).c_str() );
 }
 
 /*
@@ -385,7 +385,7 @@ static void SV_Systeminfo_f()
 	}
 
 	Log::Notice( "System info settings:" );
-	Info_Print( Cvar_InfoString( CVAR_SYSTEMINFO, false ) );
+	Info_Print( Cvar_InfoString( CVAR_SYSTEMINFO ).c_str() );
 }
 
 class ListMapsCmd: public Cmd::StaticCmd

src/engine/server/sv_init.cpp

@@ -563,9 +563,9 @@ void SV_SpawnServer(std::string pakname, std::string mapname)
 
 	// save systeminfo and serverinfo strings
 	cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
-	SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO, true ) );
+	SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO ).c_str() );
 
-	SV_SetConfigstring( CS_SERVERINFO, Cvar_InfoString( CVAR_SERVERINFO, false ) );
+	SV_SetConfigstring( CS_SERVERINFO, Cvar_InfoString( CVAR_SERVERINFO ).c_str() );
 	cvar_modifiedFlags &= ~CVAR_SERVERINFO;
 
 	// any media configstring setting now should issue a warning

src/engine/server/sv_main.cpp

@@ -1360,13 +1360,13 @@ void SV_Frame( int msec )
 	// update infostrings if anything has been changed
 	if ( cvar_modifiedFlags & CVAR_SERVERINFO )
 	{
-		SV_SetConfigstring( CS_SERVERINFO, Cvar_InfoString( CVAR_SERVERINFO, false ) );
+		SV_SetConfigstring( CS_SERVERINFO, Cvar_InfoString( CVAR_SERVERINFO ).c_str() );
 		cvar_modifiedFlags &= ~CVAR_SERVERINFO;
 	}
 
 	if ( cvar_modifiedFlags & CVAR_SYSTEMINFO )
 	{
-		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO, true ) );
+		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO ).c_str() );
 		cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
 	}
 

src/engine/server/sv_sgame.cpp

@@ -174,7 +174,7 @@ void SV_GetServerinfo( char *buffer, int bufferSize )
 		Sys::Drop( "SV_GetServerinfo: bufferSize == %i", bufferSize );
 	}
 
-	Q_strncpyz( buffer, Cvar_InfoString( CVAR_SERVERINFO, false ), bufferSize );
+	Q_strncpyz( buffer, Cvar_InfoString( CVAR_SERVERINFO ).c_str(), bufferSize );
 }
 
 /*