*name = NULL;
g_string_free(gs_name, TRUE);
} else {
- *name = gs_name->str;
- g_string_free(gs_name, FALSE);
+ *name = g_string_free(gs_name, FALSE);
}
} else {
g_string_free(gs_name, TRUE);
}
- *plugin = gs_plugin->str;
- *comp_cls = gs_comp_cls->str;
- g_string_free(gs_plugin, FALSE);
- g_string_free(gs_comp_cls, FALSE);
+ *plugin = g_string_free(gs_plugin, FALSE);
+ *comp_cls = g_string_free(gs_comp_cls, FALSE);
gs_name = NULL;
gs_plugin = NULL;
gs_comp_cls = NULL;
{ OPT_OUTPUT, 'w', "output", true },
{ OPT_OUTPUT_FORMAT, 'o', "output-format", true },
{ OPT_PARAMS, 'p', "params", true },
- { OPT_PLUGIN_PATH, '\0', "plugin-path", true },
{ OPT_RETRY_DURATION, '\0', "retry-duration", true },
{ OPT_RUN_ARGS, '\0', "run-args", false },
{ OPT_RUN_ARGS_0, '\0', "run-args-0", false },
BT_ASSERT(begin);
BT_ASSERT(end);
- *begin = g_begin->str;
- *end = g_end->str;
- g_string_free(g_begin, FALSE);
- g_string_free(g_end, FALSE);
+ *begin = g_string_free(g_begin, FALSE);
+ *end = g_string_free(g_end, FALSE);
g_begin = NULL;
g_end = NULL;
goto end;
switch (argpar_item_opt->descr->id) {
case OPT_BEGIN:
if (trimmer_has_begin) {
- printf("At --begin option: --begin or --timerange option already specified\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("At --begin option: --begin or --timerange option already specified\n %s\n",
arg);
goto error;
}
break;
case OPT_END:
if (trimmer_has_end) {
- printf("At --end option: --end or --timerange option already specified\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("At --end option: --end or --timerange option already specified\n %s\n",
arg);
goto error;
}
char *end;
if (trimmer_has_begin || trimmer_has_end) {
- printf("At --timerange option: --begin, --end, or --timerange option already specified\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("At --timerange option: --begin, --end, or --timerange option already specified\n %s\n",
arg);
goto error;
}