sourcemm/CSmmAPI.cpp
changeset 296 ba7337defd34
parent 294 0d87bc8606f8
child 298 0316a0d55281
     1.1 --- a/sourcemm/CSmmAPI.cpp	Sat Mar 03 06:57:30 2007 +0000
     1.2 +++ b/sourcemm/CSmmAPI.cpp	Wed Mar 21 17:45:28 2007 +0000
     1.3 @@ -42,10 +42,8 @@
     1.4  	va_list ap;
     1.5  	static char buffer[2048];
     1.6  
     1.7 -	buffer[0] = '\0';
     1.8 -
     1.9  	va_start(ap, msg);
    1.10 -	vsnprintf(buffer, sizeof(buffer)-1, msg, ap);
    1.11 +	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
    1.12  	va_end(ap);
    1.13  
    1.14  	LogMessage("[%s] %s", pl->GetLogTag(), buffer);
    1.15 @@ -131,11 +129,13 @@
    1.16  void CSmmAPI::ConPrintf(const char *fmt, ...)
    1.17  {
    1.18  	va_list ap;
    1.19 -	static char buf[4096];
    1.20 +	static char buffer[4096];
    1.21 +
    1.22  	va_start(ap, fmt);
    1.23 -	vsnprintf(buf, sizeof(buf)-1, fmt, ap);
    1.24 -	ConPrint(buf);
    1.25 +	UTIL_FormatArgs(buffer, sizeof(buffer), fmt, ap);
    1.26  	va_end(ap);
    1.27 +
    1.28 +	(m_ConPrintf)("%s", buffer);
    1.29  }
    1.30  
    1.31  void CSmmAPI::AddListener(ISmmPlugin *plugin, IMetamodListener *pListener)
    1.32 @@ -275,7 +275,7 @@
    1.33  			}
    1.34  		#endif
    1.35  
    1.36 -			if (!offs || ptr[offs-1] != IA32_CALL)
    1.37 +			if (!offs || ptr[offs - 1] != IA32_CALL)
    1.38  			{
    1.39  				m_ConPrintf = (CONPRINTF_FUNC)Msg;
    1.40  				return false;
    1.41 @@ -322,11 +322,11 @@
    1.42  	int i;
    1.43  	int num = 0;
    1.44  
    1.45 -	for (i=length-1; i>=0; i--)
    1.46 +	for (i = length - 1; i >= 0; i--)
    1.47  	{
    1.48  		if (!isdigit(iface[i]))
    1.49  		{
    1.50 -			if (i != length-1)
    1.51 +			if (i != length - 1)
    1.52  			{
    1.53  				num = 1;
    1.54  			}
    1.55 @@ -334,12 +334,12 @@
    1.56  		}
    1.57  	}
    1.58  
    1.59 -	if ( (num && ((int)maxlength <= length)) || (!num && ((int)maxlength <= length+3)) )
    1.60 +	if ( (num && ((int)maxlength <= length)) || (!num && ((int)maxlength <= length + 3)) )
    1.61  	{
    1.62  		return -1;
    1.63  	}
    1.64  
    1.65 -	if (i != length-1)
    1.66 +	if (i != length - 1)
    1.67  		num = atoi(&(iface[++i]));
    1.68  
    1.69  	num++;
    1.70 @@ -384,10 +384,10 @@
    1.71  void *CSmmAPI::VInterfaceMatch(CreateInterfaceFn fn, const char *iface, int min)
    1.72  {
    1.73  	char buffer[256];	/* assume no interface will go beyond this */
    1.74 -	int len = static_cast<int>(strlen(iface));
    1.75 +	size_t len = strlen(iface);
    1.76  	int ret;			/* just in case something doesn't handle NULL properly */
    1.77  
    1.78 -	if (len > static_cast<int>(sizeof(buffer) - 4))
    1.79 +	if (len > sizeof(buffer) - 4)
    1.80  	{
    1.81  		return NULL;
    1.82  	}
    1.83 @@ -396,7 +396,7 @@
    1.84  
    1.85  	if (min != -1)
    1.86  	{
    1.87 -		char *ptr = &buffer[len-1];
    1.88 +		char *ptr = &buffer[len - 1];
    1.89  		int digits = 0;
    1.90  		while (isdigit(*ptr) && digits <=3)
    1.91  		{
    1.92 @@ -427,30 +427,29 @@
    1.93  void CSmmAPI::PathFormat(char *buffer, size_t len, const char *fmt, ...)
    1.94  {
    1.95  	va_list ap;
    1.96 -	va_start(ap,fmt);
    1.97 -	size_t mylen = vsnprintf(buffer, len, fmt, ap);
    1.98 +	va_start(ap, fmt);
    1.99 +	size_t mylen = UTIL_FormatArgs(buffer, len, fmt, ap);
   1.100  	va_end(ap);
   1.101  
   1.102 -	if (mylen == 0xFFFFFFFF || mylen >= len)
   1.103 -	{
   1.104 -		mylen = len - 1;
   1.105 -	}
   1.106 -
   1.107 -	for (size_t i=0; i<mylen; i++)
   1.108 +	for (size_t i = 0; i < mylen; i++)
   1.109  	{
   1.110  		if (buffer[i] == ALT_SEP_CHAR)
   1.111 +		{
   1.112  			buffer[i] = PATH_SEP_CHAR;
   1.113 +		}
   1.114  	}
   1.115  }
   1.116  
   1.117  void CSmmAPI::ClientConPrintf(edict_t *client, const char *fmt, ...)
   1.118  {
   1.119  	va_list ap;
   1.120 -	static char buf[4096];
   1.121 +	static char buffer[4096];
   1.122 +
   1.123  	va_start(ap, fmt);
   1.124 -	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
   1.125 -	g_Engine.engine->ClientPrintf(client, buf);
   1.126 +	UTIL_FormatArgs(buffer, sizeof(buffer), fmt, ap);
   1.127  	va_end(ap);
   1.128 +
   1.129 +	g_Engine.engine->ClientPrintf(client, buffer);
   1.130  }
   1.131  
   1.132  void CSmmAPI::LoadAsVSP()