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

Make modulecmd_argtype_to_str return values constant

Browse Source 
The function needlessly allocated memory for the type strings.
This commit is contained in:
Markus Mäkelä
2017-05-29 14:59:30 +03:00
parent 948a059004
commit 7baa52b763
3 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/routing/debugcli/debugcmd.c
View File

@ -330,13 +330,9 @@ bool listfuncs_cb(const MODULECMD *cmd, void *data)
if (MODULECMD_GET_TYPE(type) != MODULECMD_ARG_OUTPUT)
{
char *t = modulecmd_argtype_to_str(&cmd->arg_types[i]);
if (t)
{
dcb_printf(dcb, "%s%s", t, i < cmd->arg_count_max - 1 ? " " : "");
MXS_FREE(t);
}
dcb_printf(dcb, "%s%s",
modulecmd_argtype_to_str(&cmd->arg_types[i]),
i < cmd->arg_count_max - 1 ? " " : "");
}
}
@ -348,14 +344,9 @@ bool listfuncs_cb(const MODULECMD *cmd, void *data)
if (MODULECMD_GET_TYPE(type) != MODULECMD_ARG_OUTPUT)
{
char *t = modulecmd_argtype_to_str(&cmd->arg_types[i]);
if (t)
{
dcb_printf(dcb, " %s - %s\n", t, cmd->arg_types[i].description);
MXS_FREE(t);
}
dcb_printf(dcb, " %s - %s\n",
modulecmd_argtype_to_str(&cmd->arg_types[i]),
cmd->arg_types[i].description);
}
}