Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace more snprintf by UTIL_Format.

Browse Source
This commit is contained in:
Arkshine
2014-08-08 12:44:37 +02:00
parent c22bb12c1e
commit b47aa6871d
61 changed files with 417 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ns/ParticleManager.cpp
View File

@ -31,7 +31,7 @@ void ParticleManager::ReadFile(void)
char FileName[256];
snprintf(FileName,sizeof(FileName)-1,"%s/ns.ps",MF_GetModname());
UTIL_Format(FileName, sizeof(FileName)-1, "%s/ns.ps", MF_GetModname());
FILE *fp=fopen(FileName,"r");
if (!fp)

2
dlls/ns/TitleManager.cpp
View File

@ -28,7 +28,7 @@ void TitleManager::LoadTitles(void)
char FileName[128];
snprintf(FileName,127,"%s/titles.txt",MF_GetModname());
UTIL_Format(FileName, sizeof(FileName)-1, "%s/titles.txt", MF_GetModname());
FILE *fp=fopen(FileName,"r");

4
dlls/ns/natives/memberfuncs.cpp
View File

@ -86,9 +86,9 @@ void MFuncs_Initialize(void)
char FileName[256];
DLHANDLE DLLBase;
#ifdef __linux__
snprintf(FileName,sizeof(FileName)-1,"%s/dlls/ns_i386.so",MF_GetModname());
UTIL_Format(FileName,sizeof(FileName)-1,"%s/dlls/ns_i386.so",MF_GetModname());
#else
snprintf(FileName,sizeof(FileName)-1,"%s\\dlls\\ns.dll",MF_GetModname());
UTIL_Format(FileName, sizeof(FileName)-1, "%s\\dlls\\ns.dll", MF_GetModname());
#endif
DLLBase=DLOPEN(FileName);

4
dlls/ns/natives/particles.cpp
View File

@ -49,7 +49,7 @@ cell PSKeyValueI(const char *name, AMX *amx, cell *params)
char StrData[1024];
snprintf(StrData,sizeof(StrData)-1,"%d",params[2]);
UTIL_Format(StrData, sizeof(StrData)-1, "%d", params[2]);
kvd.szClassName=const_cast<char *>(STRING(reinterpret_cast<edict_t *>(params[1])->v.classname));
kvd.szKeyName=name;
@ -72,7 +72,7 @@ cell PSKeyValueF(const char *name, AMX *amx, cell *params)
char StrData[1024];
snprintf(StrData,sizeof(StrData)-1,"%f",amx_ctof2(params[2]));
UTIL_Format(StrData, sizeof(StrData)-1, "%f", amx_ctof2(params[2]));
kvd.szClassName=const_cast<char *>(STRING(reinterpret_cast<edict_t *>(params[1])->v.classname));
kvd.szKeyName=name;

18
dlls/ns/sdk/amxxmodule.cpp
View File

@ -3123,3 +3123,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;
}
}

2
dlls/ns/sdk/amxxmodule.h
View File

@ -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__