mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
qom: Clean up inconsistent use of gchar * vs. char *
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:
parent
975ac4559c
commit
ddfb0baaf2
8 changed files with 38 additions and 36 deletions
4
memory.c
4
memory.c
|
@ -1175,7 +1175,7 @@ static void memory_region_get_container(Object *obj, Visitor *v,
|
|||
Error **errp)
|
||||
{
|
||||
MemoryRegion *mr = MEMORY_REGION(obj);
|
||||
gchar *path = (gchar *)"";
|
||||
char *path = (char *)"";
|
||||
|
||||
if (mr->container) {
|
||||
path = object_get_canonical_path(OBJECT(mr->container));
|
||||
|
@ -2845,7 +2845,7 @@ static void mtree_expand_owner(const char *label, Object *obj)
|
|||
if (dev && dev->id) {
|
||||
qemu_printf(" id=%s", dev->id);
|
||||
} else {
|
||||
gchar *canonical_path = object_get_canonical_path(obj);
|
||||
char *canonical_path = object_get_canonical_path(obj);
|
||||
if (canonical_path) {
|
||||
qemu_printf(" path=%s", canonical_path);
|
||||
g_free(canonical_path);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue