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

Uncrustify maxscale

Browse Source 
See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/core/mariadb.cc
View File

@ -19,12 +19,12 @@ namespace
using namespace maxscale;
typedef void (*Callback)(void* pCollection,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available);
typedef void (* Callback)(void* pCollection,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available);
int get_info(MYSQL* pMysql, Callback pCallback, void* pCollection)
{
@ -65,12 +65,12 @@ int get_info(MYSQL* pMysql, Callback pCallback, void* pCollection)
template<class Collection>
inline int get_info(MYSQL* pMysql,
void (*pCallback)(Collection* pCollection,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available),
void (* pCallback)(Collection* pCollection,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available),
Collection* pCollection)
{
pCollection->clear();
@ -81,9 +81,9 @@ inline int get_info(MYSQL* pMysql,
void add_info_by_path(std::map<std::string, disk::SizesAndName>* pSizes,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available)
int64_t total,
int64_t used,
int64_t available)
{
pSizes->insert(std::make_pair(zPath, disk::SizesAndName(total, used, available, zDisk)));
}
@ -91,9 +91,9 @@ void add_info_by_path(std::map<std::string, disk::SizesAndName>* pSizes,
void add_info_by_disk(std::map<std::string, disk::SizesAndPaths>* pSizes,
const char* zDisk,
const char* zPath,
int64_t total,
int64_t used,
int64_t available)
int64_t total,
int64_t used,
int64_t available)
{
auto i = pSizes->find(zDisk);
@ -114,7 +114,6 @@ void add_info_by_disk(std::map<std::string, disk::SizesAndPaths>* pSizes,
pSizes->insert(std::make_pair(zDisk, item));
}
}
}
@ -133,7 +132,5 @@ int get_info_by_disk(MYSQL* pMysql, std::map<std::string, disk::SizesAndPaths>*
{
return get_info(pMysql, add_info_by_disk, pInfo);
}
}
}