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

Compile QLA-filter as C++

Browse Source
This commit is contained in:
Esa Korhonen
2017-06-12 17:20:06 +03:00
parent 509c6d25f9
commit 121284df46
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/qlafilter/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(qlafilter SHARED qlafilter.c) add_library(qlafilter SHARED qlafilter.cc)
target_link_libraries(qlafilter maxscale-common) target_link_libraries(qlafilter maxscale-common)
set_target_properties(qlafilter PROPERTIES VERSION "1.1.1") set_target_properties(qlafilter PROPERTIES VERSION "1.1.1")
install_module(qlafilter core) install_module(qlafilter core)

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

@ -328,7 +328,7 @@ createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
const char UNIFIED[] = ".unified"; const char UNIFIED[] = ".unified";
int namelen = strlen(my_instance->filebase) + sizeof(UNIFIED); int namelen = strlen(my_instance->filebase) + sizeof(UNIFIED);
char *filename = NULL; char *filename = NULL;
if ((filename = MXS_CALLOC(namelen, sizeof(char))) != NULL) if ((filename = (char*)MXS_CALLOC(namelen, sizeof(char))) != NULL)
{ {
snprintf(filename, namelen, "%s.unified", my_instance->filebase); snprintf(filename, namelen, "%s.unified", my_instance->filebase);
// Open the file. It is only closed at program exit // Open the file. It is only closed at program exit
@ -386,7 +386,7 @@ newSession(MXS_FILTER *instance, MXS_SESSION *session)
QLA_SESSION *my_session; QLA_SESSION *my_session;
const char *remote, *userName; const char *remote, *userName;
if ((my_session = MXS_CALLOC(1, sizeof(QLA_SESSION))) != NULL) if ((my_session = (QLA_SESSION*)MXS_CALLOC(1, sizeof(QLA_SESSION))) != NULL)
{ {
my_session->fp = NULL; my_session->fp = NULL;
my_session->match_data = NULL; my_session->match_data = NULL;
@ -830,7 +830,7 @@ static int write_log_entry(uint32_t data_flags, FILE *logfile, QLA_INSTANCE *ins
cause garbled printing if several threads write simultaneously, so we cause garbled printing if several threads write simultaneously, so we
have to first print to a string. */ have to first print to a string. */
char *print_str = NULL; char *print_str = NULL;
if ((print_str = MXS_CALLOC(print_len, sizeof(char))) == NULL) if ((print_str = (char*)MXS_CALLOC(print_len, sizeof(char))) == NULL)
{ {
return -1; return -1;
} }