SV_GetServerinfo(): use std::string

Author: VReaperV

src/engine/server/sg_msgdef.h

@@ -75,7 +75,7 @@ using GetUserinfoMsg =  IPC::SyncMessage<
     IPC::Reply<std::string>
 >;
 using GetServerinfoMsg = IPC::SyncMessage<
-    IPC::Message<IPC::Id<VM::QVM, G_GET_SERVERINFO>, int>,
+    IPC::Message<IPC::Id<VM::QVM, G_GET_SERVERINFO>>,
     IPC::Reply<std::string>
 >;
 using GetUsercmdMsg = IPC::SyncMessage<

src/engine/server/sv_sgame.cpp

@@ -167,14 +167,9 @@ SV_GetServerinfo
 
 ===============
 */
-void SV_GetServerinfo( char *buffer, int bufferSize )
+std::string SV_GetServerinfo()
 {
-	if ( bufferSize < 1 )
-	{
-		Sys::Drop( "SV_GetServerinfo: bufferSize == %i", bufferSize );
-	}
-
-	Q_strncpyz( buffer, Cvar_InfoString( CVAR_SERVERINFO ).c_str(), bufferSize );
+	return Cvar_InfoString( CVAR_SERVERINFO );
 }
 
 /*
@@ -498,11 +493,8 @@ void GameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& chan
 		break;
 
 	case G_GET_SERVERINFO:
-		IPC::HandleMsg<GetServerinfoMsg>(channel, std::move(reader), [this](int len, std::string& res) {
-			std::unique_ptr<char[]> buffer(new char[len]);
-			buffer[0] = '\0';
-			SV_GetServerinfo(buffer.get(), len);
-			res.assign(buffer.get());
+		IPC::HandleMsg<GetServerinfoMsg>(channel, std::move(reader), [this](std::string& res) {
+			res = SV_GetServerinfo();
 		});
 		break;
 

src/shared/server/sg_api.cpp

@@ -91,11 +91,11 @@ std::string trap_GetUserinfo( int num )
     return res;
 }
 
-void trap_GetServerinfo(char *buffer, int bufferSize)
+std::string trap_GetServerinfo()
 {
     std::string res;
-    VM::SendMsg<GetServerinfoMsg>(bufferSize, res);
-    Q_strncpyz(buffer, res.c_str(), bufferSize);
+    VM::SendMsg<GetServerinfoMsg>(res);
+    return res;
 }
 
 void trap_GetUsercmd(int clientNum, usercmd_t *cmd)

src/shared/server/sg_api.h

@@ -43,7 +43,7 @@ void             trap_SetConfigstringRestrictions( int num, const clientList_t *
 void             trap_GetConfigstring( int num, char *buffer, int bufferSize );
 void             trap_SetUserinfo( int num, const std::string& userinfo );
 std::string      trap_GetUserinfo( int num );
-void             trap_GetServerinfo( char *buffer, int bufferSize );
+std::string      trap_GetServerinfo();
 int              trap_BotAllocateClient();
 void             trap_BotFreeClient( int clientNum );
 void             trap_GetUsercmd( int clientNum, usercmd_t *cmd );