diff mbox

[2/5] qemu-img: Consistently name Error * objects err, and not errp

Message ID 1398330930-29133-3-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster April 24, 2014, 9:15 a.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-img.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Markus Armbruster April 24, 2014, 11:51 a.m. UTC | #1 
Kevin Wolf <kwolf@redhat.com> writes:

> Am 24.04.2014 um 11:15 hat Markus Armbruster geschrieben:
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  qemu-img.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/qemu-img.c b/qemu-img.c
>> index 8455994..88124bf 100644
>> --- a/qemu-img.c
>> +++ b/qemu-img.c
>> @@ -442,12 +442,12 @@ fail:
>>  
>>  static void dump_json_image_check(ImageCheck *check, bool quiet)
>>  {
>> -    Error *errp = NULL;
>> +    Error *err = NULL;
>>      QString *str;
>>      QmpOutputVisitor *ov = qmp_output_visitor_new();
>>      QObject *obj;
>>      visit_type_ImageCheck(qmp_output_get_visitor(ov),
>> -                          &check, NULL, &errp);
>> +                          &check, NULL, &err);
>>      obj = qmp_output_get_qobject(ov);
>>      str = qobject_to_json_pretty(obj);
>>      assert(str != NULL);
>
> I'd like to have my bikeshed green: Can we use local_err instead, please?

Sure!
diff mbox

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 8455994..88124bf 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -442,12 +442,12 @@  fail:
 
 static void dump_json_image_check(ImageCheck *check, bool quiet)
 {
-    Error *errp = NULL;
+    Error *err = NULL;
     QString *str;
     QmpOutputVisitor *ov = qmp_output_visitor_new();
     QObject *obj;
     visit_type_ImageCheck(qmp_output_get_visitor(ov),
-                          &check, NULL, &errp);
+                          &check, NULL, &err);
     obj = qmp_output_get_qobject(ov);
     str = qobject_to_json_pretty(obj);
     assert(str != NULL);
@@ -1712,12 +1712,12 @@  static void dump_snapshots(BlockDriverState *bs)
 
 static void dump_json_image_info_list(ImageInfoList *list)
 {
-    Error *errp = NULL;
+    Error *err = NULL;
     QString *str;
     QmpOutputVisitor *ov = qmp_output_visitor_new();
     QObject *obj;
     visit_type_ImageInfoList(qmp_output_get_visitor(ov),
-                             &list, NULL, &errp);
+                             &list, NULL, &err);
     obj = qmp_output_get_qobject(ov);
     str = qobject_to_json_pretty(obj);
     assert(str != NULL);
@@ -1729,12 +1729,12 @@  static void dump_json_image_info_list(ImageInfoList *list)
 
 static void dump_json_image_info(ImageInfo *info)
 {
-    Error *errp = NULL;
+    Error *err = NULL;
     QString *str;
     QmpOutputVisitor *ov = qmp_output_visitor_new();
     QObject *obj;
     visit_type_ImageInfo(qmp_output_get_visitor(ov),
-                         &info, NULL, &errp);
+                         &info, NULL, &err);
     obj = qmp_output_get_qobject(ov);
     str = qobject_to_json_pretty(obj);
     assert(str != NULL);