You don't want to know the details of the error? No problemo.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I82f024f3cc78554f5eaa8a72998e9226c5195a4b
}
static __attribute__((format(ARGPAR_PRINTF_FORMAT, 2, 3)))
}
static __attribute__((format(ARGPAR_PRINTF_FORMAT, 2, 3)))
-bool append_string_printf(char ** const str, const char *fmt, ...)
+bool try_append_string_printf(char ** const str, const char *fmt, ...)
bool success;
va_list args;
bool success;
va_list args;
+ if (!str) {
+ success = true;
+ goto end;
+ }
+
ARGPAR_ASSERT(str);
va_start(args, fmt);
addendum = argpar_vasprintf(fmt, args);
ARGPAR_ASSERT(str);
va_start(args, fmt);
addendum = argpar_vasprintf(fmt, args);
struct argpar_item_opt *opt_item;
if (strlen(short_opts) == 0) {
struct argpar_item_opt *opt_item;
if (strlen(short_opts) == 0) {
- append_string_printf(error, "Invalid argument");
+ try_append_string_printf(error, "Invalid argument");
descr = find_descr(descrs, *iter->short_opt_ch, NULL);
if (!descr) {
ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
descr = find_descr(descrs, *iter->short_opt_ch, NULL);
if (!descr) {
ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
- append_string_printf(error, "Unknown option `-%c`",
+ try_append_string_printf(error, "Unknown option `-%c`",
*iter->short_opt_ch);
goto error;
}
*iter->short_opt_ch);
goto error;
}
*/
if (!opt_arg || (iter->short_opt_ch[1] &&
strlen(opt_arg) == 0)) {
*/
if (!opt_arg || (iter->short_opt_ch[1] &&
strlen(opt_arg) == 0)) {
- append_string_printf(error,
+ try_append_string_printf(error,
"Missing required argument for option `-%c`",
*iter->short_opt_ch);
used_next_orig_arg = false;
"Missing required argument for option `-%c`",
*iter->short_opt_ch);
used_next_orig_arg = false;
const char *long_opt_name = long_opt_arg;
if (strlen(long_opt_arg) == 0) {
const char *long_opt_name = long_opt_arg;
if (strlen(long_opt_arg) == 0) {
- append_string_printf(error, "Invalid argument");
+ try_append_string_printf(error, "Invalid argument");
/* Isolate the option name */
if (long_opt_name_size > max_len) {
/* Isolate the option name */
if (long_opt_name_size > max_len) {
- append_string_printf(error, "Invalid argument `--%s`",
- long_opt_arg);
+ try_append_string_printf(error,
+ "Invalid argument `--%s`", long_opt_arg);
/* Find corresponding option descriptor */
descr = find_descr(descrs, '\0', long_opt_name);
if (!descr) {
/* Find corresponding option descriptor */
descr = find_descr(descrs, '\0', long_opt_name);
if (!descr) {
- append_string_printf(error, "Unknown option `--%s`",
+ try_append_string_printf(error, "Unknown option `--%s`",
long_opt_name);
ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
goto error;
long_opt_name);
ret = PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT;
goto error;
} else {
/* `--long-opt arg` style */
if (!next_orig_arg) {
} else {
/* `--long-opt arg` style */
if (!next_orig_arg) {
- append_string_printf(error,
+ try_append_string_printf(error,
"Missing required argument for option `--%s`",
long_opt_name);
goto error;
"Missing required argument for option `--%s`",
long_opt_name);
goto error;
* Unexpected `--opt=arg` style for a long option which
* doesn't accept an argument.
*/
* Unexpected `--opt=arg` style for a long option which
* doesn't accept an argument.
*/
- append_string_printf(error,
+ try_append_string_printf(error,
"Unexpected argument for option `--%s`", long_opt_name);
goto error;
}
"Unexpected argument for option `--%s`", long_opt_name);
goto error;
}
-bool prepend_while_parsing_arg_to_error(char ** const error,
+bool try_prepend_while_parsing_arg_to_error(char ** const error,
const unsigned int i, const char * const arg)
{
char *new_error;
bool success;
const unsigned int i, const char * const arg)
{
char *new_error;
bool success;
+ if (!error) {
+ success = true;
+ goto end;
+ }
+
ARGPAR_ASSERT(*error);
new_error = argpar_asprintf("While parsing argument #%u (`%s`): %s",
i + 1, arg, *error);
ARGPAR_ASSERT(*error);
new_error = argpar_asprintf("While parsing argument #%u (`%s`): %s",
i + 1, arg, *error);
const char *next_orig_arg;
ARGPAR_ASSERT(iter->i <= iter->argc);
const char *next_orig_arg;
ARGPAR_ASSERT(iter->i <= iter->argc);
+
+ if (error) {
+ *error = NULL;
+ }
if (iter->i == iter->argc) {
status = ARGPAR_ITER_PARSE_NEXT_STATUS_END;
if (iter->i == iter->argc) {
status = ARGPAR_ITER_PARSE_NEXT_STATUS_END;
status = ARGPAR_ITER_PARSE_NEXT_STATUS_OK;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT:
status = ARGPAR_ITER_PARSE_NEXT_STATUS_OK;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR_UNKNOWN_OPT:
- prepend_while_parsing_arg_to_error(error, iter->i, orig_arg);
+ try_prepend_while_parsing_arg_to_error(error, iter->i,
+ orig_arg);
status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR:
status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT;
break;
case PARSE_ORIG_ARG_OPT_RET_ERROR:
- prepend_while_parsing_arg_to_error(error, iter->i, orig_arg);
+ try_prepend_while_parsing_arg_to_error(error, iter->i,
+ orig_arg);
status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR;
break;
default:
status = ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR;
break;
default:
*
* On failure (status codes
* `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT` and
*
* On failure (status codes
* `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT` and
- * `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR`), this function sets `*error`
- * to a descriptive error string. Free `*error` with free().
+ * `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR`), this function sets `*error`,
+ * if not `NULL`, to a descriptive error string. Free `*error` with
+ * free().
*
* Create an argument parsing iterator with argpar_iter_create().
*/
*
* Create an argument parsing iterator with argpar_iter_create().
*/