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

Rework build pathname functions (#422)

Browse Source 
* Rework build_pathname* functions

* Replace old platform defines with the new ones

* Correct usage of build_pathname_r()

* Fix inconsistencies (white spaces)

* Remove useless defines
This commit is contained in:
Karol Szuster
2017-03-11 19:26:25 +01:00
committed by Vincent Herbet
parent fa3d28872e
commit 9551c70c59
13 changed files with 688 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/hamsandwich/config_parser.cpp
View File

@ -242,7 +242,7 @@ int read_number(char *input)
char *end; /* Temporary pointer, needed for strtoul(). */
// if begins with 0x or 0X it's to be interpretted as hex
if (*input=='0' &&
if (*input=='0' &&
(*(input+1)=='x' || *(input+1)=='X'))
{
return strtoul(input,&end,16);
@ -307,7 +307,7 @@ int ReadConfig(void)
{
char FileName[512];
MF_BuildPathnameR(FileName,sizeof(FileName)-1,"%s",get_localinfo("amxx_configsdir","addons/amxmodx/configs"));
MF_BuildPathnameR(FileName,sizeof(FileName),"%s",get_localinfo("amxx_configsdir","addons/amxmodx/configs"));
strncat(FileName,"/hamdata.ini",sizeof(FileName)-1);

4
modules/nvault/amxxapi.cpp
View File

@ -46,13 +46,13 @@ static cell nvault_open(AMX *amx, cell *params)
int len, id=-1;
char *name = MF_GetAmxString(amx, params[1], 0, &len);
char path[255], file[255];
MF_BuildPathnameR(path, sizeof(path)-1, "%s/vault", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
MF_BuildPathnameR(path, sizeof(path), "%s/vault", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
sprintf(file, "%s/%s.vault", path, name);
for (size_t i=0; i<g_Vaults.length(); i++)
{
if (!g_Vaults[i])
continue;
if (strcmp(g_Vaults.at(i)->GetFilename(), file) == 0)
if (strcmp(g_Vaults.at(i)->GetFilename(), file) == 0)
return i;
}
NVault *v = (NVault *)g_VaultMngr.OpenVault(file);

7
modules/sqlite/basic_sql.cpp
View File

@ -59,13 +59,13 @@ static cell AMX_NATIVE_CALL SQL_MakeDbTuple(AMX *amx, cell *params)
char path[255];
FILE *fp;
MF_BuildPathnameR(path, sizeof(path)-1, "%s", db);
MF_BuildPathnameR(path, sizeof(path), "%s", db);
if ((fp=fopen(path, "rb")))
{
fclose(fp);
sql->db = strdup(path);
} else {
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3/%s.sq3",
MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3/%s.sq3",
MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"),
db);
sql->db = strdup(path);
@ -601,7 +601,7 @@ static cell AMX_NATIVE_CALL SQL_SetCharset(AMX *amx, cell *params)
return 0;
}
AMX_NATIVE_INFO g_BaseSqlNatives[] =
AMX_NATIVE_INFO g_BaseSqlNatives[] =
{
{"SQL_MakeDbTuple", SQL_MakeDbTuple},
{"SQL_FreeHandle", SQL_FreeHandle},
@ -630,4 +630,3 @@ AMX_NATIVE_INFO g_BaseSqlNatives[] =
{NULL, NULL},
};

5
modules/sqlite/module.cpp
View File

@ -17,7 +17,7 @@
static int g_ident = 0;
SqlFunctions g_SqliteFuncs =
SqlFunctions g_SqliteFuncs =
{
&g_Sqlite,
SetMysqlAffinity,
@ -69,7 +69,7 @@ void OnAmxxAttach()
MF_OverrideNatives(g_OldCompatNatives, MODULE_NAME);
char path[255];
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
if (!DirExists(path))
{
mkdir(path
@ -96,4 +96,3 @@ void OnPluginsUnloaded()
extern "C" void __cxa_pure_virtual(void)
{
}

12
modules/sqlite/oldcompat_sql.cpp
View File

@ -73,14 +73,14 @@ static cell AMX_NATIVE_CALL dbi_connect(AMX *amx, cell *params)
int err;
char error[512];
/** if there is an older database, read there instead of the new path */
MF_BuildPathnameR(path, sizeof(path)-1, "%s", info.database);
MF_BuildPathnameR(path, sizeof(path), "%s", info.database);
FILE *fp = fopen(path, "rb");
if (fp)
{
fclose(fp);
info.database = path;
} else {
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3/%s.sq3",
MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3/%s.sq3",
MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"),
info.database);
info.database = path;
@ -439,14 +439,14 @@ static cell AMX_NATIVE_CALL dbi_field_name(AMX *amx, cell *params)
return 1;
}
AMX_NATIVE_INFO g_OldCompatNatives[] =
AMX_NATIVE_INFO g_OldCompatNatives[] =
{
{ "dbi_connect", dbi_connect },
{ "dbi_query", dbi_query },
{ "dbi_query2", dbi_query2 },
{ "dbi_field", dbi_field },
{ "dbi_nextrow", dbi_nextrow },
{ "dbi_close", dbi_close },
{ "dbi_field", dbi_field },
{ "dbi_nextrow", dbi_nextrow },
{ "dbi_close", dbi_close },
{ "dbi_error", dbi_error },
{ "dbi_type", dbi_type },
{ "dbi_free_result", dbi_free_result },