ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-img: Consistently name Error * objects err, and not errp 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2014-04-25 16:50:32 +02:00 committed by Stefan Hajnoczi
parent 0fb6395c0c
commit 4399c438a4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qemu-img.c
View File

@ -457,12 +457,12 @@ fail:
static void dump_json_image_check(ImageCheck *check, bool quiet) static void dump_json_image_check(ImageCheck *check, bool quiet)
{ {
Error *errp = NULL; Error *local_err = NULL;
QString *str; QString *str;
QmpOutputVisitor *ov = qmp_output_visitor_new(); QmpOutputVisitor *ov = qmp_output_visitor_new();
QObject *obj; QObject *obj;
visit_type_ImageCheck(qmp_output_get_visitor(ov), visit_type_ImageCheck(qmp_output_get_visitor(ov),
&check, NULL, &errp); &check, NULL, &local_err);
obj = qmp_output_get_qobject(ov); obj = qmp_output_get_qobject(ov);
str = qobject_to_json_pretty(obj); str = qobject_to_json_pretty(obj);
assert(str != NULL); assert(str != NULL);
@ -1731,12 +1731,12 @@ static void dump_snapshots(BlockDriverState *bs)
static void dump_json_image_info_list(ImageInfoList *list) static void dump_json_image_info_list(ImageInfoList *list)
{ {
Error *errp = NULL; Error *local_err = NULL;
QString *str; QString *str;
QmpOutputVisitor *ov = qmp_output_visitor_new(); QmpOutputVisitor *ov = qmp_output_visitor_new();
QObject *obj; QObject *obj;
visit_type_ImageInfoList(qmp_output_get_visitor(ov), visit_type_ImageInfoList(qmp_output_get_visitor(ov),
&list, NULL, &errp); &list, NULL, &local_err);
obj = qmp_output_get_qobject(ov); obj = qmp_output_get_qobject(ov);
str = qobject_to_json_pretty(obj); str = qobject_to_json_pretty(obj);
assert(str != NULL); assert(str != NULL);
@ -1748,12 +1748,12 @@ static void dump_json_image_info_list(ImageInfoList *list)
static void dump_json_image_info(ImageInfo *info) static void dump_json_image_info(ImageInfo *info)
{ {
Error *errp = NULL; Error *local_err = NULL;
QString *str; QString *str;
QmpOutputVisitor *ov = qmp_output_visitor_new(); QmpOutputVisitor *ov = qmp_output_visitor_new();
QObject *obj; QObject *obj;
visit_type_ImageInfo(qmp_output_get_visitor(ov), visit_type_ImageInfo(qmp_output_get_visitor(ov),
&info, NULL, &errp); &info, NULL, &local_err);
obj = qmp_output_get_qobject(ov); obj = qmp_output_get_qobject(ov);
str = qobject_to_json_pretty(obj); str = qobject_to_json_pretty(obj);
assert(str != NULL); assert(str != NULL);