picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: handle invalid enum values better

Browse source
This commit is contained in:
Lennart Poettering 2012-05-03 23:06:19 +02:00
parent 06dab8e18a
commit 6e476bc9d1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/shared/dbus-common.h
View file

@ -155,7 +155,7 @@ int bus_property_set_uint64(DBusMessageIter *i, const char *property, void *data
assert(i); \
assert(property); \
\
value = name##_to_string(*field); \
value = strempty(name##_to_string(*field)); \
\
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &value)) \
return -ENOMEM; \
@ -166,15 +166,18 @@ int bus_property_set_uint64(DBusMessageIter *i, const char *property, void *data
#define DEFINE_BUS_PROPERTY_SET_ENUM(function,name,type) \
int function(DBusMessageIter *i, const char *property, void *data) { \
const char *value; \
type *field = data; \
type f, *field = data; \
\
assert(i); \
assert(property); \
\
dbus_message_iter_get_basic(i, &value); \
\
*field = name##_from_string(value); \
f = name##_from_string(value); \
if (f < 0) \
return f; \
\
*field = f; \
return 0; \
}