Skip to content

Commit 468d513

Browse files
committed
trap_EscapedArgs()/trap_LiteralArgs(): use std::string
1 parent 4b93c4e commit 468d513

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/shared/CommonProxies.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,12 @@ const Cmd::Args& trap_Args() {
242242
return *argStack.back();
243243
}
244244

245-
void trap_EscapedArgs( char *buffer, int bufferLength ) {
246-
const Cmd::Args* args = argStack.back();
247-
std::string res = args->EscapedArgs(0);
248-
Q_strncpyz( buffer, res.c_str(), bufferLength );
245+
std::string trap_EscapedArgs() {
246+
return argStack.back()->EscapedArgs(0);
249247
}
250248

251-
void trap_LiteralArgs( char *buffer, int bufferLength ) {
252-
const Cmd::Args* args = argStack.back();
253-
std::string res = args->ConcatArgs(0);
254-
Q_strncpyz( buffer, res.c_str(), bufferLength );
249+
std::string trap_LiteralArgs() {
250+
return argStack.back()->ConcatArgs(0);
255251
}
256252

257253
namespace Cmd {

src/shared/CommonProxies.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void trap_CompleteCallback(const char* complete);
5555
int trap_Argc();
5656
void trap_Argv(int n, char* buffer, int bufferLength);
5757
const Cmd::Args& trap_Args();
58-
void trap_EscapedArgs(char* buffer, int bufferLength);
59-
void trap_LiteralArgs(char* buffer, int bufferLength);
58+
std::string trap_EscapedArgs();
59+
std::string trap_LiteralArgs();
6060
void trap_Cvar_Set(const char* varName, const char* value);
6161
int trap_Cvar_VariableIntegerValue(const char* varName);
6262
float trap_Cvar_VariableValue(const char* varName);

0 commit comments

Comments
 (0)