Merging upstream version 2.1~rc0 (Closes: #1015722).
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
9489161ac8
commit
316e846c86
504 changed files with 6751 additions and 2957 deletions
|
@ -1,3 +1,4 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* Copyright 2014 PMC-Sierra, Inc.
|
||||
*
|
||||
|
@ -135,7 +136,7 @@ void argconfig_print_help(const char *program_desc,
|
|||
return;
|
||||
|
||||
printf("\n\033[1mOptions:\033[0m\n");
|
||||
for (s = options; (s->option != NULL) && (s != NULL); s++)
|
||||
for (s = options; (s != NULL) && (s->option != NULL); s++)
|
||||
show_option(s);
|
||||
}
|
||||
|
||||
|
@ -528,7 +529,8 @@ void argconfig_register_help_func(argconfig_help_func * f)
|
|||
for (i = 0; i < MAX_HELP_FUNC; i++) {
|
||||
if (help_funcs[i] == NULL) {
|
||||
help_funcs[i] = f;
|
||||
help_funcs[i + 1] = NULL;
|
||||
if (i < MAX_HELP_FUNC - 1)
|
||||
help_funcs[i + 1] = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue