Message ID | 20191204093625.14836-5-armbru@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Error handling fixes | expand |
On 12/4/19 3:36 AM, Markus Armbruster wrote: > Declaring a local Error *err without initializer looks suspicious. > Fuse the declaration with the initialization to avoid that. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > tests/test-qobject-output-visitor.c | 8 ++++---- > tests/test-string-output-visitor.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On 12/4/19 10:36 AM, Markus Armbruster wrote: > Declaring a local Error *err without initializer looks suspicious. > Fuse the declaration with the initialization to avoid that. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > tests/test-qobject-output-visitor.c | 8 ++++---- > tests/test-string-output-visitor.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c > index 3e993e5ba8..d7761ebf84 100644 > --- a/tests/test-qobject-output-visitor.c > +++ b/tests/test-qobject-output-visitor.c > @@ -145,10 +145,10 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, > const void *unused) > { > EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 }; > - Error *err; > > for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { > - err = NULL; > + Error *err = NULL; > + Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); > error_free_or_abort(&err); > visitor_reset(data); > @@ -240,11 +240,11 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data, > EnumOne bad_values[] = { ENUM_ONE__MAX, -1 }; > UserDefOne u = {0}; > UserDefOne *pu = &u; > - Error *err; > int i; > > for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { > - err = NULL; > + Error *err = NULL; > + > u.has_enum1 = true; > u.enum1 = bad_values[i]; > visit_type_UserDefOne(data->ov, "unused", &pu, &err); > diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c > index 02766c0f65..1be1540767 100644 > --- a/tests/test-string-output-visitor.c > +++ b/tests/test-string-output-visitor.c > @@ -207,10 +207,10 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, > const void *unused) > { > EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 }; > - Error *err; > > for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { > - err = NULL; > + Error *err = NULL; > + > visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); > error_free_or_abort(&err); > } >
diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index 3e993e5ba8..d7761ebf84 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -145,10 +145,10 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, const void *unused) { EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 }; - Error *err; for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { - err = NULL; + Error *err = NULL; + visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); error_free_or_abort(&err); visitor_reset(data); @@ -240,11 +240,11 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data, EnumOne bad_values[] = { ENUM_ONE__MAX, -1 }; UserDefOne u = {0}; UserDefOne *pu = &u; - Error *err; int i; for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { - err = NULL; + Error *err = NULL; + u.has_enum1 = true; u.enum1 = bad_values[i]; visit_type_UserDefOne(data->ov, "unused", &pu, &err); diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index 02766c0f65..1be1540767 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -207,10 +207,10 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data, const void *unused) { EnumOne i, bad_values[] = { ENUM_ONE__MAX, -1 }; - Error *err; for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) { - err = NULL; + Error *err = NULL; + visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); error_free_or_abort(&err); }
Declaring a local Error *err without initializer looks suspicious. Fuse the declaration with the initialization to avoid that. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- tests/test-qobject-output-visitor.c | 8 ++++---- tests/test-string-output-visitor.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)