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 <ebl...@redhat.com>
---
v5: blank line after declaration
v4: new patch
---
include/qapi/string-output-visitor.h | 1 -
hmp.c | 2 +-
net/net.c | 2 +-
qapi/string-output-visitor.c | 5 -----
qom/object.c | 11 ++++++-----
tests/test-string-output-visitor.c | 2 +-
tests/test-visitor-serialization.c | 4 ++--
7 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/include/qapi/string-output-visitor.h
b/include/qapi/string-output-visitor.h
index e10522a..03e377e 100644
--- a/include/qapi/string-output-visitor.h
+++ b/include/qapi/string-output-visitor.h
@@ -23,7 +23,6 @@ typedef struct StringOutputVisitor StringOutputVisitor;
* requires a non-null list argument to visit_start_list().
*/
StringOutputVisitor *string_output_visitor_new(bool human);
-void string_output_visitor_cleanup(StringOutputVisitor *v);
char *string_output_get_string(StringOutputVisitor *v);
Visitor *string_output_get_visitor(StringOutputVisitor *v);
diff --git a/hmp.c b/hmp.c
index 7578ee6..f8036cb 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1997,7 +1997,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
monitor_printf(mon, " host nodes: %s\n", str);
g_free(str);
- string_output_visitor_cleanup(ov);
+ visit_free(string_output_get_visitor(ov));
m = m->next;
i++;
}
diff --git a/net/net.c b/net/net.c
index 5e9e1e7..3cc5254 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1210,7 +1210,7 @@ static void netfilter_print_info(Monitor *mon,
NetFilterState *nf)
object_property_get(OBJECT(nf), string_output_get_visitor(ov),
prop->name, NULL);
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);
g_free(str);
}
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 6933c8e..dd15f1d 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -326,11 +326,6 @@ static void string_output_free(Visitor *v)
{
StringOutputVisitor *sov = to_sov(v);
- string_output_visitor_cleanup(sov);
-}
-
-void string_output_visitor_cleanup(StringOutputVisitor *sov)
-{
if (sov->string) {
g_string_free(sov->string, true);
}
diff --git a/qom/object.c b/qom/object.c
index 00dd68c..5c834eb 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1236,14 +1236,15 @@ int object_property_get_enum(Object *obj, const char
*name,
enumprop = prop->opaque;
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) {
error_propagate(errp, err);
- string_output_visitor_cleanup(sov);
+ visit_free(v);
return 0;
}
str = string_output_get_string(sov);
- string_output_visitor_cleanup(sov);
+ visit_free(v);
v = string_input_visitor_new(str);
visit_type_enum(v, name, &ret, enumprop->strings, errp);
@@ -1275,7 +1276,7 @@ void object_property_get_uint16List(Object *obj, const
char *name,
g_free(str);
visit_free(v);
out:
- string_output_visitor_cleanup(ov);
+ visit_free(string_output_get_visitor(ov));
}
void object_property_parse(Object *obj, const char *string,
@@ -1303,7 +1304,7 @@ char *object_property_print(Object *obj, const char
*name, bool human,
string = string_output_get_string(sov);
out:
- string_output_visitor_cleanup(sov);
+ visit_free(string_output_get_visitor(sov));
return string;
}
diff --git a/tests/test-string-output-visitor.c
b/tests/test-string-output-visitor.c
index edff523..bfa3e8e 100644
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -50,7 +50,7 @@ static void visitor_output_setup_human(TestOutputVisitorData
*data,
static void visitor_output_teardown(TestOutputVisitorData *data,
const void *unused)
{
- string_output_visitor_cleanup(data->sov);
+ visit_free(data->ov);
data->sov = NULL;
data->ov = NULL;
}
diff --git a/tests/test-visitor-serialization.c
b/tests/test-visitor-serialization.c
index 0766dcc..377ee3e 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -1047,7 +1047,7 @@ static void qmp_deserialize(void **native_out, void
*datap,
static void qmp_cleanup(void *datap)
{
QmpSerializeData *d = datap;
- qmp_output_visitor_cleanup(d->qov);
+ visit_free(qmp_output_get_visitor(d->qov));
visit_free(d->qiv);
g_free(d);
@@ -1083,7 +1083,7 @@ static void string_cleanup(void *datap)
{
StringSerializeData *d = datap;
- string_output_visitor_cleanup(d->sov);
+ visit_free(string_output_get_visitor(d->sov));
visit_free(d->siv);
g_free(d->string);
g_free(d);
--
2.5.5
