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

string-output-visitor: Favor new visit_free() function 

Now that we have a polymorphic visit_free(), we no longer need
string_output_visitor_cleanup(); however, we still need to
expose the subtype for string_output_get_string().

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-9-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-06-09 10:48:39 -06:00 committed by Markus Armbruster
parent b70ce1018a
commit e7ca565629
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp.c
View File

@ -2006,7 +2006,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
monitor_printf(mon, " host nodes: %s\n", str); monitor_printf(mon, " host nodes: %s\n", str);
g_free(str); g_free(str);
string_output_visitor_cleanup(ov); visit_free(string_output_get_visitor(ov));
m = m->next; m = m->next;
i++; i++;
} }

1
include/qapi/string-output-visitor.h
View File

@ -23,7 +23,6 @@ typedef struct StringOutputVisitor StringOutputVisitor;
* requires a non-null list argument to visit_start_list(). * requires a non-null list argument to visit_start_list().
*/ */
StringOutputVisitor *string_output_visitor_new(bool human); StringOutputVisitor *string_output_visitor_new(bool human);
void string_output_visitor_cleanup(StringOutputVisitor *v);
char *string_output_get_string(StringOutputVisitor *v); char *string_output_get_string(StringOutputVisitor *v);
Visitor *string_output_get_visitor(StringOutputVisitor *v); Visitor *string_output_get_visitor(StringOutputVisitor *v);

2
net/net.c
View File

@ -1210,7 +1210,7 @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf)
object_property_get(OBJECT(nf), string_output_get_visitor(ov), object_property_get(OBJECT(nf), string_output_get_visitor(ov),
prop->name, NULL); prop->name, NULL);
str = string_output_get_string(ov); str = string_output_get_string(ov);
string_output_visitor_cleanup(ov); visit_free(string_output_get_visitor(ov));
monitor_printf(mon, ",%s=%s", prop->name, str); monitor_printf(mon, ",%s=%s", prop->name, str);
g_free(str); g_free(str);
} }

5
qapi/string-output-visitor.c
View File

@ -326,11 +326,6 @@ static void string_output_free(Visitor *v)
{ {
StringOutputVisitor *sov = to_sov(v); StringOutputVisitor *sov = to_sov(v);
string_output_visitor_cleanup(sov);
}
void string_output_visitor_cleanup(StringOutputVisitor *sov)
{
if (sov->string) { if (sov->string) {
g_string_free(sov->string, true); g_string_free(sov->string, true);
} }

11
qom/object.c
View File

@ -1242,14 +1242,15 @@ int object_property_get_enum(Object *obj, const char *name,
enumprop = prop->opaque; enumprop = prop->opaque;
sov = string_output_visitor_new(false); sov = string_output_visitor_new(false);
object_property_get(obj, string_output_get_visitor(sov), name, &err); v = string_output_get_visitor(sov);
object_property_get(obj, v, name, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
string_output_visitor_cleanup(sov); visit_free(v);
return 0; return 0;
} }
str = string_output_get_string(sov); str = string_output_get_string(sov);
string_output_visitor_cleanup(sov); visit_free(v);
v = string_input_visitor_new(str); v = string_input_visitor_new(str);
visit_type_enum(v, name, &ret, enumprop->strings, errp); visit_type_enum(v, name, &ret, enumprop->strings, errp);
@ -1281,7 +1282,7 @@ void object_property_get_uint16List(Object *obj, const char *name,
g_free(str); g_free(str);
visit_free(v); visit_free(v);
out: out:
string_output_visitor_cleanup(ov); visit_free(string_output_get_visitor(ov));
} }
void object_property_parse(Object *obj, const char *string, void object_property_parse(Object *obj, const char *string,
@ -1309,7 +1310,7 @@ char *object_property_print(Object *obj, const char *name, bool human,
string = string_output_get_string(sov); string = string_output_get_string(sov);
out: out:
string_output_visitor_cleanup(sov); visit_free(string_output_get_visitor(sov));
return string; return string;
} }

2
tests/test-string-output-visitor.c
View File

@ -50,7 +50,7 @@ static void visitor_output_setup_human(TestOutputVisitorData *data,
static void visitor_output_teardown(TestOutputVisitorData *data, static void visitor_output_teardown(TestOutputVisitorData *data,
const void *unused) const void *unused)
{ {
string_output_visitor_cleanup(data->sov); visit_free(data->ov);
data->sov = NULL; data->sov = NULL;
data->ov = NULL; data->ov = NULL;
} }

4
tests/test-visitor-serialization.c
View File

@ -1047,7 +1047,7 @@ static void qmp_deserialize(void **native_out, void *datap,
static void qmp_cleanup(void *datap) static void qmp_cleanup(void *datap)
{ {
QmpSerializeData *d = datap; QmpSerializeData *d = datap;
qmp_output_visitor_cleanup(d->qov); visit_free(qmp_output_get_visitor(d->qov));
visit_free(d->qiv); visit_free(d->qiv);
g_free(d); g_free(d);
@ -1083,7 +1083,7 @@ static void string_cleanup(void *datap)
{ {
StringSerializeData *d = datap; StringSerializeData *d = datap;
string_output_visitor_cleanup(d->sov); visit_free(string_output_get_visitor(d->sov));
visit_free(d->siv); visit_free(d->siv);
g_free(d->string); g_free(d->string);
g_free(d); g_free(d);