chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc27380
)
detect_virtualization() returns NULL; pass empty string to dbus
author
Kay Sievers
<kay@vrfy.org>
Fri, 1 Nov 2013 23:01:32 +0000
(
00:01
+0100)
committer
Kay Sievers
<kay@vrfy.org>
Fri, 1 Nov 2013 23:02:56 +0000
(
00:02
+0100)
src/core/dbus-manager.c
patch
|
blob
|
history
diff --git
a/src/core/dbus-manager.c
b/src/core/dbus-manager.c
index 46f55d088bb1250d4c2592b48f5fa8dc08490627..b47fc851015d24bee3c927f6c74a990eb1bff645 100644
(file)
--- a/
src/core/dbus-manager.c
+++ b/
src/core/dbus-manager.c
@@
-466,7
+466,7
@@
static int bus_manager_append_progress(DBusMessageIter *i, const char *property,
static int bus_manager_append_virt(DBusMessageIter *i, const char *property, void *data) {
Manager *m = data;
static int bus_manager_append_virt(DBusMessageIter *i, const char *property, void *data) {
Manager *m = data;
- const char *id =
""
;
+ const char *id =
NULL
;
assert(i);
assert(property);
assert(i);
assert(property);
@@
-474,6
+474,8
@@
static int bus_manager_append_virt(DBusMessageIter *i, const char *property, voi
detect_virtualization(&id);
detect_virtualization(&id);
+ if (!id)
+ id = "";
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
return -ENOMEM;
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
return -ENOMEM;