From: Simon Marchi Date: Thu, 16 Dec 2021 04:13:45 +0000 (-0500) Subject: common: compile argpar-utils as C++ X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7c2f789a14457b69b934ccea5deb8d2404cae1ee;p=lttng-tools.git common: compile argpar-utils as C++ argpar-utils was in review while everything was converted to be compiled as C++, so it missed the boat. Do it now. Change-Id: Ica005b3b27cc0bd9ef6e886d7078649096c7c7a2 Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/argpar-utils/Makefile.am b/src/common/argpar-utils/Makefile.am index 00d31c90f..53425cd32 100644 --- a/src/common/argpar-utils/Makefile.am +++ b/src/common/argpar-utils/Makefile.am @@ -1,5 +1,5 @@ noinst_LTLIBRARIES = libargpar-utils.la libargpar_utils_la_SOURCES = \ - argpar-utils.c \ + argpar-utils.cpp \ argpar-utils.h diff --git a/src/common/argpar-utils/argpar-utils.c b/src/common/argpar-utils/argpar-utils.c deleted file mode 100644 index 493598693..000000000 --- a/src/common/argpar-utils/argpar-utils.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (C) 2021 Simon Marchi - * - * SPDX-License-Identifier: GPL-2.0-only - * - */ - -#include "argpar-utils.h" - -#include - -#include -#include - -/* - * Given argpar error status `status` and error `error`, return a formatted - * error message describing the error. - * - * `argv` is the argument vector that was being parsed. - * - * `context_fmt`, if non-NULL, is formatted using `args` and prepended to the - * error message. - * - * Add `argc_offset` the the argument index mentioned in the error message. - * - * The returned string must be freed by the caller. - */ -static ATTR_FORMAT_PRINTF(4, 0) -char *format_arg_error_v(const struct argpar_error *error, int argc_offset, - const char **argv, const char *context_fmt, va_list args) -{ - char *str = NULL; - char *str_ret = NULL; - int ret; - - if (context_fmt) { - ret = vasprintf(&str, context_fmt, args); - if (ret == -1) { - /* - * If vasprintf fails, the content of str is undefined, - * and we shouldn't try to free it. - */ - str = NULL; - goto end; - } - - ret = strutils_append_str(&str, ": "); - if (ret < 0) { - goto end; - } - } - - switch (argpar_error_type(error)) - { - case ARGPAR_ERROR_TYPE_MISSING_OPT_ARG: - { - const int orig_index = argpar_error_orig_index(error); - const char *arg = argv[orig_index]; - - ret = strutils_appendf(&str, - WHILE_PARSING_ARG_N_ARG_FMT "Missing required argument for option `%s`", - orig_index + 1 + argc_offset, argv[orig_index], arg); - if (ret < 0) { - goto end; - } - - break; - } - case ARGPAR_ERROR_TYPE_UNEXPECTED_OPT_ARG: - { - bool is_short; - const struct argpar_opt_descr *descr = - argpar_error_opt_descr(error, &is_short); - int orig_index = argpar_error_orig_index(error); - const char *arg = argv[orig_index]; - - if (is_short) { - ret = strutils_appendf(&str, - WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `-%c`", - orig_index + 1 + argc_offset, arg, descr->short_name); - } else { - ret = strutils_appendf(&str, - WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `--%s`", - orig_index + 1 + argc_offset, arg, descr->long_name); - } - - if (ret < 0) { - goto end; - } - - break; - } - case ARGPAR_ERROR_TYPE_UNKNOWN_OPT: - { - int orig_index = argpar_error_orig_index(error); - const char *unknown_opt = argpar_error_unknown_opt_name(error); - - ret = strutils_appendf(&str, - WHILE_PARSING_ARG_N_ARG_FMT "Unknown option `%s`", - orig_index + 1 + argc_offset, argv[orig_index], unknown_opt); - - if (ret < 0) { - goto end; - } - - break; - } - default: - abort (); - } - - str_ret = str; - str = NULL; - -end: - free(str); - return str_ret; -} - -enum parse_next_item_status parse_next_item(struct argpar_iter *iter, - const struct argpar_item **item, int argc_offset, - const char **argv, bool unknown_opt_is_error, - const struct argpar_error **error_out, - const char *context_fmt, ...) -{ - enum argpar_iter_next_status status; - const struct argpar_error *error = NULL; - enum parse_next_item_status ret; - - ARGPAR_ITEM_DESTROY_AND_RESET(*item); - status = argpar_iter_next(iter, item, &error); - - switch (status) { - case ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY: - ERR("Failed to get next argpar item."); - ret = PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY; - break; - case ARGPAR_ITER_NEXT_STATUS_ERROR: - { - va_list args; - char *err_str; - - if (argpar_error_type(error) == ARGPAR_ERROR_TYPE_UNKNOWN_OPT && - !unknown_opt_is_error) { - ret = PARSE_NEXT_ITEM_STATUS_END; - break; - } - - va_start(args, context_fmt); - err_str = format_arg_error_v(error, argc_offset, argv, - context_fmt, args); - va_end(args); - - if (err_str) { - ERR("%s", err_str); - free(err_str); - } else { - ERR("%s", "Failed to format argpar error."); - } - - ret = PARSE_NEXT_ITEM_STATUS_ERROR; - break; - } - case ARGPAR_ITER_NEXT_STATUS_END: - ret = PARSE_NEXT_ITEM_STATUS_END; - break; - case ARGPAR_ITER_NEXT_STATUS_OK: - ret = PARSE_NEXT_ITEM_STATUS_OK; - break; - default: - abort(); - } - - if (error_out) { - argpar_error_destroy(*error_out); - *error_out = error; - error = NULL; - } - - argpar_error_destroy(error); - - return ret; -} diff --git a/src/common/argpar-utils/argpar-utils.cpp b/src/common/argpar-utils/argpar-utils.cpp new file mode 100644 index 000000000..493598693 --- /dev/null +++ b/src/common/argpar-utils/argpar-utils.cpp @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2021 Simon Marchi + * + * SPDX-License-Identifier: GPL-2.0-only + * + */ + +#include "argpar-utils.h" + +#include + +#include +#include + +/* + * Given argpar error status `status` and error `error`, return a formatted + * error message describing the error. + * + * `argv` is the argument vector that was being parsed. + * + * `context_fmt`, if non-NULL, is formatted using `args` and prepended to the + * error message. + * + * Add `argc_offset` the the argument index mentioned in the error message. + * + * The returned string must be freed by the caller. + */ +static ATTR_FORMAT_PRINTF(4, 0) +char *format_arg_error_v(const struct argpar_error *error, int argc_offset, + const char **argv, const char *context_fmt, va_list args) +{ + char *str = NULL; + char *str_ret = NULL; + int ret; + + if (context_fmt) { + ret = vasprintf(&str, context_fmt, args); + if (ret == -1) { + /* + * If vasprintf fails, the content of str is undefined, + * and we shouldn't try to free it. + */ + str = NULL; + goto end; + } + + ret = strutils_append_str(&str, ": "); + if (ret < 0) { + goto end; + } + } + + switch (argpar_error_type(error)) + { + case ARGPAR_ERROR_TYPE_MISSING_OPT_ARG: + { + const int orig_index = argpar_error_orig_index(error); + const char *arg = argv[orig_index]; + + ret = strutils_appendf(&str, + WHILE_PARSING_ARG_N_ARG_FMT "Missing required argument for option `%s`", + orig_index + 1 + argc_offset, argv[orig_index], arg); + if (ret < 0) { + goto end; + } + + break; + } + case ARGPAR_ERROR_TYPE_UNEXPECTED_OPT_ARG: + { + bool is_short; + const struct argpar_opt_descr *descr = + argpar_error_opt_descr(error, &is_short); + int orig_index = argpar_error_orig_index(error); + const char *arg = argv[orig_index]; + + if (is_short) { + ret = strutils_appendf(&str, + WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `-%c`", + orig_index + 1 + argc_offset, arg, descr->short_name); + } else { + ret = strutils_appendf(&str, + WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `--%s`", + orig_index + 1 + argc_offset, arg, descr->long_name); + } + + if (ret < 0) { + goto end; + } + + break; + } + case ARGPAR_ERROR_TYPE_UNKNOWN_OPT: + { + int orig_index = argpar_error_orig_index(error); + const char *unknown_opt = argpar_error_unknown_opt_name(error); + + ret = strutils_appendf(&str, + WHILE_PARSING_ARG_N_ARG_FMT "Unknown option `%s`", + orig_index + 1 + argc_offset, argv[orig_index], unknown_opt); + + if (ret < 0) { + goto end; + } + + break; + } + default: + abort (); + } + + str_ret = str; + str = NULL; + +end: + free(str); + return str_ret; +} + +enum parse_next_item_status parse_next_item(struct argpar_iter *iter, + const struct argpar_item **item, int argc_offset, + const char **argv, bool unknown_opt_is_error, + const struct argpar_error **error_out, + const char *context_fmt, ...) +{ + enum argpar_iter_next_status status; + const struct argpar_error *error = NULL; + enum parse_next_item_status ret; + + ARGPAR_ITEM_DESTROY_AND_RESET(*item); + status = argpar_iter_next(iter, item, &error); + + switch (status) { + case ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY: + ERR("Failed to get next argpar item."); + ret = PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY; + break; + case ARGPAR_ITER_NEXT_STATUS_ERROR: + { + va_list args; + char *err_str; + + if (argpar_error_type(error) == ARGPAR_ERROR_TYPE_UNKNOWN_OPT && + !unknown_opt_is_error) { + ret = PARSE_NEXT_ITEM_STATUS_END; + break; + } + + va_start(args, context_fmt); + err_str = format_arg_error_v(error, argc_offset, argv, + context_fmt, args); + va_end(args); + + if (err_str) { + ERR("%s", err_str); + free(err_str); + } else { + ERR("%s", "Failed to format argpar error."); + } + + ret = PARSE_NEXT_ITEM_STATUS_ERROR; + break; + } + case ARGPAR_ITER_NEXT_STATUS_END: + ret = PARSE_NEXT_ITEM_STATUS_END; + break; + case ARGPAR_ITER_NEXT_STATUS_OK: + ret = PARSE_NEXT_ITEM_STATUS_OK; + break; + default: + abort(); + } + + if (error_out) { + argpar_error_destroy(*error_out); + *error_out = error; + error = NULL; + } + + argpar_error_destroy(error); + + return ret; +}