OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qom/object_interfaces: Clean up global variable shadowing

Browse Source 
Fix:

  qom/object_interfaces.c:262:53: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp)
                                                      ^
  qom/object_interfaces.c:298:46: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  bool user_creatable_add_from_str(const char *optarg, Error **errp)
                                               ^
  qom/object_interfaces.c:313:49: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  void user_creatable_process_cmdline(const char *optarg)
                                                  ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/getopt.h:77:14: note: previous declaration is here
  extern char *optarg;                    /* getopt(3) external variables */
               ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004120019.93101-9-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-04 14:00:11 +02:00 committed by Markus Armbruster
parent 21c029e65f
commit e0c7de8dc4
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/qom/object_interfaces.h
View File

@ -99,7 +99,7 @@ void user_creatable_add_qapi(ObjectOptions *options, Error **errp);
/** /**
* user_creatable_parse_str: * user_creatable_parse_str:
* @optarg: the object definition string as passed on the command line * @str: the object definition string as passed on the command line
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Parses the option for the user creatable object with a keyval parser and * Parses the option for the user creatable object with a keyval parser and
@ -110,14 +110,14 @@ void user_creatable_add_qapi(ObjectOptions *options, Error **errp);
* Returns: ObjectOptions on success, NULL when an error occurred (*errp is set * Returns: ObjectOptions on success, NULL when an error occurred (*errp is set
* then) or help was printed (*errp is not set). * then) or help was printed (*errp is not set).
*/ */
ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp); ObjectOptions *user_creatable_parse_str(const char *str, Error **errp);
/** /**
* user_creatable_add_from_str: * user_creatable_add_from_str:
* @optarg: the object definition string as passed on the command line * @str: the object definition string as passed on the command line
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Create an instance of the user creatable object by parsing optarg * Create an instance of the user creatable object by parsing @str
* with a keyval parser and implicit key 'qom-type', converting the * with a keyval parser and implicit key 'qom-type', converting the
* result to ObjectOptions and calling into qmp_object_add(). * result to ObjectOptions and calling into qmp_object_add().
* *
@ -126,13 +126,13 @@ ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp);
* Returns: true when an object was successfully created, false when an error * Returns: true when an object was successfully created, false when an error
* occurred (*errp is set then) or help was printed (*errp is not set). * occurred (*errp is set then) or help was printed (*errp is not set).
*/ */
bool user_creatable_add_from_str(const char *optarg, Error **errp); bool user_creatable_add_from_str(const char *str, Error **errp);
/** /**
* user_creatable_process_cmdline: * user_creatable_process_cmdline:
* @optarg: the object definition string as passed on the command line * @cmdline: the object definition string as passed on the command line
* *
* Create an instance of the user creatable object by parsing optarg * Create an instance of the user creatable object by parsing @cmdline
* with a keyval parser and implicit key 'qom-type', converting the * with a keyval parser and implicit key 'qom-type', converting the
* result to ObjectOptions and calling into qmp_object_add(). * result to ObjectOptions and calling into qmp_object_add().
* *
@ -141,7 +141,7 @@ bool user_creatable_add_from_str(const char *optarg, Error **errp);
* This function is only meant to be called during command line parsing. * This function is only meant to be called during command line parsing.
* It exits the process on failure or after printing help. * It exits the process on failure or after printing help.
*/ */
void user_creatable_process_cmdline(const char *optarg); void user_creatable_process_cmdline(const char *cmdline);
/** /**
* user_creatable_print_help: * user_creatable_print_help:

16
qom/object_interfaces.c
View File

@ -259,7 +259,7 @@ static void user_creatable_print_help_from_qdict(QDict *args)
} }
} }
ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp) ObjectOptions *user_creatable_parse_str(const char *str, Error **errp)
{ {
ERRP_GUARD(); ERRP_GUARD();
QObject *obj; QObject *obj;
@ -267,14 +267,14 @@ ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp)
Visitor *v; Visitor *v;
ObjectOptions *options; ObjectOptions *options;
if (optarg[0] == '{') { if (str[0] == '{') {
obj = qobject_from_json(optarg, errp); obj = qobject_from_json(str, errp);
if (!obj) { if (!obj) {
return NULL; return NULL;
} }
v = qobject_input_visitor_new(obj); v = qobject_input_visitor_new(obj);
} else { } else {
QDict *args = keyval_parse(optarg, "qom-type", &help, errp); QDict *args = keyval_parse(str, "qom-type", &help, errp);
if (*errp) { if (*errp) {
return NULL; return NULL;
} }
@ -295,12 +295,12 @@ ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp)
return options; return options;
} }
bool user_creatable_add_from_str(const char *optarg, Error **errp) bool user_creatable_add_from_str(const char *str, Error **errp)
{ {
ERRP_GUARD(); ERRP_GUARD();
ObjectOptions *options; ObjectOptions *options;
options = user_creatable_parse_str(optarg, errp); options = user_creatable_parse_str(str, errp);
if (!options) { if (!options) {
return false; return false;
} }
@ -310,9 +310,9 @@ bool user_creatable_add_from_str(const char *optarg, Error **errp)
return !*errp; return !*errp;
} }
void user_creatable_process_cmdline(const char *optarg) void user_creatable_process_cmdline(const char *cmdline)
{ {
if (!user_creatable_add_from_str(optarg, &error_fatal)) { if (!user_creatable_add_from_str(cmdline, &error_fatal)) {
/* Help was printed */ /* Help was printed */
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }