hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace strerror_r with mxs_strerror

Browse Source 
The mxs_strerror function requires no local buffer, thus making it simpler
and cleaner to use.
This commit is contained in:
Markus Mäkelä
2017-03-07 12:18:53 +02:00
parent d7e48f93bb
commit e1a1959bc2
33 changed files with 174 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/cache/rules.cc vendored
View File

@ -231,10 +231,8 @@ CACHE_RULES *cache_rules_load(const char *path, uint32_t debug)
}
else
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not open rules file %s for reading: %s",
path, strerror_r(errno, errbuf, sizeof(errbuf)));
path, mxs_strerror(errno));
}
return rules;

12
server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc vendored
View File

@ -70,8 +70,7 @@ bool deletePath(const string& path)
}
else
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not stat: %s", strerror_r(errno, errbuf, sizeof(errbuf)));
MXS_ERROR("Could not stat: %s", mxs_strerror(errno));
}
}
else
@ -98,10 +97,9 @@ bool deletePath(const string& path)
case FTS_DNR:
case FTS_ERR:
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Error while traversing %s: %s",
pCurrent->fts_accpath,
strerror_r(pCurrent->fts_errno, errbuf, sizeof(errbuf)));
mxs_strerror(pCurrent->fts_errno));
rv = false;
}
break;
@ -125,11 +123,10 @@ bool deletePath(const string& path)
case FTS_DEFAULT:
if (remove(pCurrent->fts_accpath) < 0)
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not remove '%s', the cache directory may need to "
"be deleted manually: %s",
pCurrent->fts_accpath,
strerror_r(errno, errbuf, sizeof(errbuf)));
mxs_strerror(errno));
rv = false;
}
break;
@ -261,10 +258,9 @@ RocksDBStorage* RocksDBStorage::Create(const char* zName,
}
else if (errno != EEXIST)
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to create storage directory %s: %s",
storageDirectory.c_str(),
strerror_r(errno, errbuf, sizeof(errbuf)));
mxs_strerror(errno));
ok = false;
}

6
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -734,9 +734,8 @@ bool dbfw_reload_rules(const MODULECMD_ARG *argv)
}
else
{
char err[MXS_STRERROR_BUFLEN];
modulecmd_set_error("Failed to read rules at '%s': %d, %s", filename,
errno, strerror_r(errno, err, sizeof(err)));
errno, mxs_strerror(errno));
rval = false;
}
@ -1483,9 +1482,8 @@ static bool process_rule_file(const char* filename, RULE** rules, HASHTABLE **us
}
else
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to open rule file '%s': %d, %s", filename, errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
mxs_strerror(errno));
}

4
server/modules/filter/masking/maskingrules.cc
View File

@ -783,10 +783,8 @@ auto_ptr<MaskingRules> MaskingRules::load(const char* zPath)
}
else
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not open rules file %s for reading: %s",
zPath, strerror_r(errno, errbuf, sizeof(errbuf)));
zPath, mxs_strerror(errno));
}
return sRules;

6
server/modules/filter/qlafilter/qlafilter.c
View File

@ -327,11 +327,10 @@ createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
if (my_instance->unified_fp == NULL)
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Opening output file for qla "
"filter failed due to %d, %s",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
mxs_strerror(errno));
error = true;
}
MXS_FREE(filename);
@ -427,11 +426,10 @@ newSession(MXS_FILTER *instance, MXS_SESSION *session)
if (my_session->fp == NULL)
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Opening output file for qla "
"filter failed due to %d, %s",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
mxs_strerror(errno));
MXS_FREE(my_session->filename);
MXS_FREE(my_session);
my_session = NULL;