diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbus-print-message.c | 14 | ||||
| -rw-r--r-- | tools/dbus-send.c | 20 |
2 files changed, 20 insertions, 14 deletions
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c index 43c41c73..572a1d14 100644 --- a/tools/dbus-print-message.c +++ b/tools/dbus-print-message.c @@ -84,7 +84,7 @@ print_message (DBusMessage *message) do { int type = dbus_message_iter_get_arg_type (&iter); - char *str; + const char *str; dbus_uint32_t uint32; dbus_int32_t int32; double d; @@ -97,32 +97,32 @@ print_message (DBusMessage *message) switch (type) { case DBUS_TYPE_STRING: - str = dbus_message_iter_get_string (&iter); + dbus_message_iter_get_basic (&iter, &str); printf ("string:%s\n", str); break; case DBUS_TYPE_INT32: - int32 = dbus_message_iter_get_int32 (&iter); + dbus_message_iter_get_basic (&iter, &int32); printf ("int32:%d\n", int32); break; case DBUS_TYPE_UINT32: - uint32 = dbus_message_iter_get_uint32 (&iter); + dbus_message_iter_get_basic (&iter, &uint32); printf ("int32:%u\n", uint32); break; case DBUS_TYPE_DOUBLE: - d = dbus_message_iter_get_double (&iter); + dbus_message_iter_get_basic (&iter, &d); printf ("double:%f\n", d); break; case DBUS_TYPE_BYTE: - byte = dbus_message_iter_get_byte (&iter); + dbus_message_iter_get_basic (&iter, &byte); printf ("byte:%d\n", byte); break; case DBUS_TYPE_BOOLEAN: - boolean = dbus_message_iter_get_boolean (&iter); + dbus_message_iter_get_basic (&iter, &boolean); printf ("boolean:%s\n", boolean ? "true" : "false"); break; diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 81ecac7e..67411b46 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -215,33 +215,39 @@ main (int argc, char *argv[]) { case DBUS_TYPE_BYTE: byte = strtoul (c, NULL, 0); - dbus_message_iter_append_byte (&iter, byte); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_BYTE, &byte); break; case DBUS_TYPE_DOUBLE: d = strtod (c, NULL); - dbus_message_iter_append_double (&iter, d); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_DOUBLE, &d); break; case DBUS_TYPE_INT32: int32 = strtol (c, NULL, 0); - dbus_message_iter_append_int32 (&iter, int32); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &int32); break; case DBUS_TYPE_UINT32: uint32 = strtoul (c, NULL, 0); - dbus_message_iter_append_uint32 (&iter, uint32); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &uint32); break; case DBUS_TYPE_STRING: - dbus_message_iter_append_string (&iter, c); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &c); break; case DBUS_TYPE_BOOLEAN: if (strcmp(c, "true") == 0) - dbus_message_iter_append_boolean (&iter, TRUE); + { + byte = TRUE; + dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &c); + } else if (strcmp(c, "false") == 0) - dbus_message_iter_append_boolean (&iter, FALSE); + { + byte = FALSE; + dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &c); + } else { fprintf (stderr, "%s: Expected \"true\" or \"false\" instead of \"%s\"\n", argv[0], c); |