revert to use of g_free to make future qemu integrations easier (#695)

* revert to use of g_free to make future qemu integrations easier

* bracing
This commit is contained in:
Chris Eagle
2016-12-21 06:28:36 -08:00
committed by Nguyen Anh Quynh
parent 6a2eb14ff3
commit fccbcfd4c2
48 changed files with 224 additions and 219 deletions

View File

@@ -55,7 +55,7 @@ static void *qapi_dealloc_pop(QapiDeallocVisitor *qov)
QObject *value;
QTAILQ_REMOVE(&qov->stack, e, node);
value = e->value;
free(e);
g_free(e);
return value;
}
@@ -72,7 +72,7 @@ static void qapi_dealloc_end_struct(Visitor *v, Error **errp)
QapiDeallocVisitor *qov = to_qov(v);
void **obj = qapi_dealloc_pop(qov);
if (obj) {
free(*obj);
g_free(*obj);
}
}
@@ -90,7 +90,7 @@ static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp)
QapiDeallocVisitor *qov = to_qov(v);
void **obj = qapi_dealloc_pop(qov);
if (obj) {
free(*obj);
g_free(*obj);
}
}
@@ -114,7 +114,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
if (list) {
list = list->next;
free(*listp);
g_free(*listp);
return list;
}
@@ -132,7 +132,7 @@ static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name,
Error **errp)
{
if (obj) {
free(*obj);
g_free(*obj);
}
}
@@ -194,7 +194,7 @@ Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v)
void qapi_dealloc_visitor_cleanup(QapiDeallocVisitor *v)
{
free(v);
g_free(v);
}
QapiDeallocVisitor *qapi_dealloc_visitor_new(void)

View File

@@ -304,10 +304,10 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[],
if (strings[value] == NULL) {
error_set(errp, QERR_INVALID_PARAMETER, enum_str);
free(enum_str);
g_free(enum_str);
return;
}
free(enum_str);
g_free(enum_str);
*obj = value;
}

View File

@@ -308,7 +308,7 @@ Visitor *qmp_input_get_visitor(QmpInputVisitor *v)
void qmp_input_visitor_cleanup(QmpInputVisitor *v)
{
qobject_decref(v->stack[0].obj);
free(v);
g_free(v);
}
QmpInputVisitor *qmp_input_visitor_new(QObject *obj)

View File

@@ -59,7 +59,7 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov)
QObject *value;
QTAILQ_REMOVE(&qov->stack, e, node);
value = e->value;
free(e);
g_free(e);
return value;
}
@@ -211,11 +211,11 @@ void qmp_output_visitor_cleanup(QmpOutputVisitor *v)
QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) {
QTAILQ_REMOVE(&v->stack, e, node);
free(e);
g_free(e);
}
qobject_decref(root);
free(v);
g_free(v);
}
QmpOutputVisitor *qmp_output_visitor_new(void)

View File

@@ -34,7 +34,7 @@ struct StringInputVisitor
static void free_range(void *range, void *dummy)
{
free(range);
g_free(range);
}
static void parse_str(StringInputVisitor *siv, Error **errp)
@@ -321,7 +321,7 @@ void string_input_visitor_cleanup(StringInputVisitor *v)
{
g_list_foreach(v->ranges, free_range, NULL);
g_list_free(v->ranges);
free(v);
g_free(v);
}
StringInputVisitor *string_input_visitor_new(const char *str)