sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

dbus: fix appending on dict for types other than string 

According to dbus documentation, dbus_message_iter_append_basic()
expects a "const char**" if type is string and a simple pointer for
other types. Since we a iterating an array, the value passed is already
a pointer.
This commit is contained in:
Lucas De Marchi 2011-01-05 15:25:06 -02:00 committed by Marcel Holtmann
parent 9aa82f5bb1
commit 435e20153c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dbus.c
View File

@ -139,8 +139,24 @@ static void append_dict_variant(DBusMessageIter *iter, int type, void *val)
dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
&(val_array[i + 0]));
dbus_message_iter_append_basic(&entry, type,
&(val_array[i + 1]));
/*
* D-Bus expects a char** or uint8* depending on the type
* given. Since we are dealing with an array through a void**
* (and thus val_array[i] is a pointer) we need to
* differentiate DBUS_TYPE_STRING from the others. The other
* option would be the user to pass the exact type to this
* function, instead of a pointer to it. However in this case
* a cast from type to void* would be needed, which is not
* good.
*/
if (type == DBUS_TYPE_STRING) {
dbus_message_iter_append_basic(&entry, type,
&(val_array[i + 1]));
} else {
dbus_message_iter_append_basic(&entry, type,
val_array[i + 1]);
}
dbus_message_iter_close_container(&array, &entry);
}