Merge pull request #110 from Arkshine/replace-more-snprintf

Replace more snprintf by UTIL_Format.

amxmodx/CLang.cpp

@@ -12,10 +12,6 @@
 #include "CLang.h"
 #include "format.h"
 
-#if defined(__linux__) || defined(__APPLE__)
-#define _snprintf snprintf
-#endif
-
 #define LITIDX_NONE			0
 #define LITIDX_BRACKET		1
 #define LITIDX_DEFINITION	2

amxmodx/amx.cpp

@@ -4092,10 +4092,6 @@ int AMXAPI amx_GetLibraries(AMX *amx)
 	return numLibraries;
 }
 
-#if defined(__linux__) || defined(__APPLE__)
-#define _snprintf snprintf
-#endif
-
 const char *AMXAPI amx_GetLibrary(AMX *amx, int index, char *buffer, int len)
 {
 	AMX_HEADER *hdr = (AMX_HEADER *)amx->base;

amxmodx/libraries.cpp

@@ -97,7 +97,7 @@ size_t AddLibrariesFromString(const char *name, LibType type, LibSource src, voi
 	char *ptr, *p, s;
 	size_t count = 0;
 
-	snprintf(buffer, sizeof(buffer)-1, "%s", name);
+	UTIL_Format(buffer, sizeof(buffer)-1, "%s", name);
 
 	ptr = buffer;
 	p = buffer;

amxmodx/sdk/amxxmodule.cpp

@@ -3124,3 +3124,21 @@ unsigned short FixedUnsigned16( float value, float scale )
 	return (unsigned short)output;
 }
 #endif // USE_METAMOD
+
+size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	size_t len = vsnprintf(buffer, maxlength, fmt, ap);
+	va_end(ap);
+
+	if (len >= maxlength)
+	{
+		buffer[maxlength - 1] = '\0';
+		return (maxlength - 1);
+	}
+	else
+	{
+		return len;
+	}
+}

amxmodx/sdk/amxxmodule.h

@@ -2495,4 +2495,6 @@ void	Mem_Deallocator(const char *sourceFile, const unsigned int sourceLine, cons
 
 #endif //MEMORY_TEST
 
+size_t UTIL_Format(char *buffer, size_t maxlength, const char *fmt, ...);
+
 #endif // #ifndef __AMXXMODULE_H__