| Message ID | 20170915103511.20122-1-christian.storm@siemens.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | parser: fix warnings for !JSON && !LIBCONFIG | expand |
Hi Christian, On 15/09/2017 12:35, Christian Storm wrote: > Fix travis's complaint about unused parameters and > functions for !CONFIG_JSON && !CONFIG_LIBCONFIG. > > Signed-off-by: Christian Storm <christian.storm@siemens.com> > --- > corelib/parsing_library.c | 16 ++++++++++++++++ > parser/parser.c | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/corelib/parsing_library.c b/corelib/parsing_library.c > index 1484141..eb3001f 100644 > --- a/corelib/parsing_library.c > +++ b/corelib/parsing_library.c > @@ -52,6 +52,8 @@ int get_array_length(parsertype p, void *root) > return config_setting_length(root); > case JSON_PARSER: > return json_object_array_length(root); > + default: > + (void)root; > } > > return 0; > @@ -64,6 +66,9 @@ void *get_elem_from_idx(parsertype p, void *node, int idx) > return config_setting_get_elem(node, idx); > case JSON_PARSER: > return json_object_array_get_idx(node, idx); > + default: > + (void)node; > + (void)idx; > } > > return NULL; > @@ -76,6 +81,9 @@ const char *get_field_string(parsertype p, void *e, const char *path) > return get_field_string_libconfig(e, path); > case JSON_PARSER: > return get_field_string_json(e, path); > + default: > + (void)e; > + (void)path; > } > > return NULL; > @@ -98,6 +106,10 @@ void get_field(parsertype p, void *e, const char *path, void *dest) > return get_field_cfg((config_setting_t *)e, path, dest); > case JSON_PARSER: > return get_field_json((json_object *)e, path, dest); > + default: > + (void)e; > + (void)path; > + (void)dest; > } > } > > @@ -110,6 +122,10 @@ int exist_field_string(parsertype p, void *e, const char *path) > path, &str); > case JSON_PARSER: > return json_object_object_get_ex((json_object *)e, path, NULL); > + default: > + (void)str; > + (void)e; > + (void)path; > } > > return 0; > diff --git a/parser/parser.c b/parser/parser.c > index c8a51e2..c962b59 100644 > --- a/parser/parser.c > +++ b/parser/parser.c > @@ -138,6 +138,7 @@ static json_object *find_node_json(json_object *root, const char *node, > } > #endif > > +#if defined(CONFIG_LIBCONFIG) || defined(CONFIG_JSON) > static void *find_node(parsertype p, void *root, const char *node, > struct swupdate_cfg *swcfg) > { > @@ -587,6 +588,7 @@ static int parser(parsertype p, void *cfg, struct swupdate_cfg *swcfg) > > return ret; > } > +#endif > > #ifdef CONFIG_LIBCONFIG > int parse_cfg (struct swupdate_cfg *swcfg, const char *filename) > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 15/09/2017 12:35, Christian Storm wrote: > Fix travis's complaint about unused parameters and > functions for !CONFIG_JSON && !CONFIG_LIBCONFIG. > > Signed-off-by: Christian Storm <christian.storm@siemens.com> > --- > corelib/parsing_library.c | 16 ++++++++++++++++ > parser/parser.c | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/corelib/parsing_library.c b/corelib/parsing_library.c > index 1484141..eb3001f 100644 > --- a/corelib/parsing_library.c > +++ b/corelib/parsing_library.c > @@ -52,6 +52,8 @@ int get_array_length(parsertype p, void *root) > return config_setting_length(root); > case JSON_PARSER: > return json_object_array_length(root); > + default: > + (void)root; > } > > return 0; > @@ -64,6 +66,9 @@ void *get_elem_from_idx(parsertype p, void *node, int idx) > return config_setting_get_elem(node, idx); > case JSON_PARSER: > return json_object_array_get_idx(node, idx); > + default: > + (void)node; > + (void)idx; > } > > return NULL; > @@ -76,6 +81,9 @@ const char *get_field_string(parsertype p, void *e, const char *path) > return get_field_string_libconfig(e, path); > case JSON_PARSER: > return get_field_string_json(e, path); > + default: > + (void)e; > + (void)path; > } > > return NULL; > @@ -98,6 +106,10 @@ void get_field(parsertype p, void *e, const char *path, void *dest) > return get_field_cfg((config_setting_t *)e, path, dest); > case JSON_PARSER: > return get_field_json((json_object *)e, path, dest); > + default: > + (void)e; > + (void)path; > + (void)dest; > } > } > > @@ -110,6 +122,10 @@ int exist_field_string(parsertype p, void *e, const char *path) > path, &str); > case JSON_PARSER: > return json_object_object_get_ex((json_object *)e, path, NULL); > + default: > + (void)str; > + (void)e; > + (void)path; > } > > return 0; > diff --git a/parser/parser.c b/parser/parser.c > index c8a51e2..c962b59 100644 > --- a/parser/parser.c > +++ b/parser/parser.c > @@ -138,6 +138,7 @@ static json_object *find_node_json(json_object *root, const char *node, > } > #endif > > +#if defined(CONFIG_LIBCONFIG) || defined(CONFIG_JSON) > static void *find_node(parsertype p, void *root, const char *node, > struct swupdate_cfg *swcfg) > { > @@ -587,6 +588,7 @@ static int parser(parsertype p, void *cfg, struct swupdate_cfg *swcfg) > > return ret; > } > +#endif > > #ifdef CONFIG_LIBCONFIG > int parse_cfg (struct swupdate_cfg *swcfg, const char *filename) > Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/corelib/parsing_library.c b/corelib/parsing_library.c index 1484141..eb3001f 100644 --- a/corelib/parsing_library.c +++ b/corelib/parsing_library.c @@ -52,6 +52,8 @@ int get_array_length(parsertype p, void *root) return config_setting_length(root); case JSON_PARSER: return json_object_array_length(root); + default: + (void)root; } return 0; @@ -64,6 +66,9 @@ void *get_elem_from_idx(parsertype p, void *node, int idx) return config_setting_get_elem(node, idx); case JSON_PARSER: return json_object_array_get_idx(node, idx); + default: + (void)node; + (void)idx; } return NULL; @@ -76,6 +81,9 @@ const char *get_field_string(parsertype p, void *e, const char *path) return get_field_string_libconfig(e, path); case JSON_PARSER: return get_field_string_json(e, path); + default: + (void)e; + (void)path; } return NULL; @@ -98,6 +106,10 @@ void get_field(parsertype p, void *e, const char *path, void *dest) return get_field_cfg((config_setting_t *)e, path, dest); case JSON_PARSER: return get_field_json((json_object *)e, path, dest); + default: + (void)e; + (void)path; + (void)dest; } } @@ -110,6 +122,10 @@ int exist_field_string(parsertype p, void *e, const char *path) path, &str); case JSON_PARSER: return json_object_object_get_ex((json_object *)e, path, NULL); + default: + (void)str; + (void)e; + (void)path; } return 0; diff --git a/parser/parser.c b/parser/parser.c index c8a51e2..c962b59 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -138,6 +138,7 @@ static json_object *find_node_json(json_object *root, const char *node, } #endif +#if defined(CONFIG_LIBCONFIG) || defined(CONFIG_JSON) static void *find_node(parsertype p, void *root, const char *node, struct swupdate_cfg *swcfg) { @@ -587,6 +588,7 @@ static int parser(parsertype p, void *cfg, struct swupdate_cfg *swcfg) return ret; } +#endif #ifdef CONFIG_LIBCONFIG int parse_cfg (struct swupdate_cfg *swcfg, const char *filename)
Fix travis's complaint about unused parameters and functions for !CONFIG_JSON && !CONFIG_LIBCONFIG. Signed-off-by: Christian Storm <christian.storm@siemens.com> --- corelib/parsing_library.c | 16 ++++++++++++++++ parser/parser.c | 2 ++ 2 files changed, 18 insertions(+)