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

Compile externcmd.c as C++

Browse Source
This commit is contained in:
Johan Wikman 2017-03-23 16:42:07 +02:00
parent 9a22d1cb92
commit 77bc2dd7bb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/CMakeLists.txt
View File

@ -8,7 +8,8 @@ add_library(maxscale-common SHARED
config_runtime.cc
dcb.cc
filter.cc
externcmd.c paths.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
externcmd.cc
paths.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})

4
server/core/externcmd.c → server/core/externcmd.cc
View File

@ -217,7 +217,7 @@ bool externcmd_substitute_arg(EXTERNCMD* cmd, const char* match, const char* rep
for (int i = 0; cmd->argv[i] && rval; i++)
{
size_t size = strlen(cmd->argv[i]);
char* dest = MXS_MALLOC(size);
char* dest = (char*)MXS_MALLOC(size);
if (dest)
{
mxs_pcre2_result_t rc = mxs_pcre2_substitute(re, cmd->argv[i], replace, &dest, &size);
@ -274,7 +274,7 @@ char* get_command(const char* str)
if (len > 0)
{
rval = MXS_MALLOC(len + 1);
rval = (char*)MXS_MALLOC(len + 1);
if (rval)
{