motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qom: Clean up inconsistent use of gchar * vs. char *

Browse source 
Uses of gchar * in qom/object.h:

* ObjectProperty member @name

  Functions that take a property name argument all use char *.  Change
  the member to match.

* ObjectProperty member @type

  Functions that take a property type argument or return it all use
  char *.  Change the member to match.

* ObjectProperty member @description

  Functions that take a property description argument all use char *.
  Change the member to match.

* object_resolve_path_component() parameter @part

  Path components are property names.  Most callers pass char *
  arguments.  Change the parameter to match.  Adjust the few callers
  that pass gchar * to pass char *.

* Return value of object_get_canonical_path_component(),
  object_get_canonical_path()

  Most callers convert their return values right back to char *.
  Change the return value to match.  Adjust the few callers where that
  would add a conversion to gchar * to use char * instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-3-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-05-05 17:29:10 +02:00
parent 975ac4559c
commit ddfb0baaf2
8 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

46
qom/object.c
View file

@ -1357,7 +1357,7 @@ void object_property_set_link(Object *obj, Object *value,
const char *name, Error **errp)
{
if (value) {
gchar *path = object_get_canonical_path(value);
char *path = object_get_canonical_path(value);
object_property_set_str(obj, path, name, errp);
g_free(path);
} else {
@ -1651,14 +1651,15 @@ static void object_get_child_property(Object *obj, Visitor *v,
Error **errp)
{
Object *child = opaque;
gchar *path;
char *path;
path = object_get_canonical_path(child);
visit_type_str(v, name, &path, errp);
g_free(path);
}
static Object *object_resolve_child_property(Object *parent, void *opaque, const gchar *part)
static Object *object_resolve_child_property(Object *parent, void *opaque,
const char *part)
{
return opaque;
}
@ -1679,7 +1680,7 @@ void object_property_add_child(Object *obj, const char *name,
Object *child, Error **errp)
{
Error *local_err = NULL;
gchar *type;
char *type;
ObjectProperty *op;
if (child->parent != NULL) {
@ -1738,14 +1739,14 @@ static void object_get_link_property(Object *obj, Visitor *v,
{
LinkProperty *lprop = opaque;
Object **targetp = object_link_get_targetp(obj, lprop);
gchar *path;
char *path;
if (*targetp) {
path = object_get_canonical_path(*targetp);
visit_type_str(v, name, &path, errp);
g_free(path);
} else {
path = (gchar *)"";
path = (char *)"";
visit_type_str(v, name, &path, errp);
}
}
@ -1763,7 +1764,7 @@ static Object *object_resolve_link(Object *obj, const char *name,
const char *path, Error **errp)
{
const char *type;
gchar *target_type;
char *target_type;
bool ambiguous = false;
Object *target;
@ -1826,7 +1827,8 @@ static void object_set_link_property(Object *obj, Visitor *v,
}
}
static Object *object_resolve_link_property(Object *parent, void *opaque, const gchar *part)
static Object *object_resolve_link_property(Object *parent, void *opaque,
const char *part)
{
LinkProperty *lprop = opaque;
@ -1856,7 +1858,7 @@ static void object_add_link_prop(Object *obj, const char *name,
{
Error *local_err = NULL;
LinkProperty *prop = g_malloc(sizeof(*prop));
gchar *full_type;
char *full_type;
ObjectProperty *op;
if (flags & OBJ_PROP_LINK_DIRECT) {
@ -1908,7 +1910,7 @@ object_class_property_add_link(ObjectClass *oc,
{
Error *local_err = NULL;
LinkProperty *prop = g_new0(LinkProperty, 1);
gchar *full_type;
char *full_type;
ObjectProperty *op;
prop->offset = offset;
@ -1943,7 +1945,7 @@ void object_property_add_const_link(Object *obj, const char *name,
NULL, OBJ_PROP_LINK_DIRECT, errp);
}
gchar *object_get_canonical_path_component(Object *obj)
char *object_get_canonical_path_component(Object *obj)
{
ObjectProperty *prop = NULL;
GHashTableIter iter;
@ -1968,7 +1970,7 @@ gchar *object_get_canonical_path_component(Object *obj)
return NULL;
}
gchar *object_get_canonical_path(Object *obj)
char *object_get_canonical_path(Object *obj)
{
Object *root = object_get_root();
char *newpath, *path = NULL;
@ -1998,7 +2000,7 @@ gchar *object_get_canonical_path(Object *obj)
return path;
}
Object *object_resolve_path_component(Object *parent, const gchar *part)
Object *object_resolve_path_component(Object *parent, const char *part)
{
ObjectProperty *prop = object_property_find(parent, part, NULL);
if (prop == NULL) {
@ -2013,9 +2015,9 @@ Object *object_resolve_path_component(Object *parent, const gchar *part)
}
static Object *object_resolve_abs_path(Object *parent,
gchar **parts,
const char *typename,
int index)
char **parts,
const char *typename,
int index)
{
Object *child;
@ -2036,9 +2038,9 @@ static Object *object_resolve_abs_path(Object *parent,
}
static Object *object_resolve_partial_path(Object *parent,
gchar **parts,
const char *typename,
bool *ambiguous)
char **parts,
const char *typename,
bool *ambiguous)
{
Object *obj;
GHashTableIter iter;
@ -2076,7 +2078,7 @@ Object *object_resolve_path_type(const char *path, const char *typename,
bool *ambiguousp)
{
Object *obj;
gchar **parts;
char **parts;
parts = g_strsplit(path, "/", 0);
assert(parts);
@ -2767,7 +2769,7 @@ static void property_set_alias(Object *obj, Visitor *v, const char *name,
}
static Object *property_resolve_alias(Object *obj, void *opaque,
const gchar *part)
const char *part)
{
AliasProperty *prop = opaque;
@ -2789,7 +2791,7 @@ void object_property_add_alias(Object *obj, const char *name,
AliasProperty *prop;
ObjectProperty *op;
ObjectProperty *target_prop;
gchar *prop_type;
char *prop_type;
Error *local_err = NULL;
target_prop = object_property_find(target_obj, target_name, errp);