diff options
| author | David Zeuthen <davidz@redhat.com> | 2005-07-13 21:13:16 +0000 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2005-07-13 21:13:16 +0000 |
| commit | 955cc78770c03edd9b88d5d73ba53901016ddf60 (patch) | |
| tree | 877592d4e83899f1511ea92cbb3764b27b804b94 | |
| parent | 2c413bf281cefde85209e5a3847735407bedaaa4 (diff) | |
2005-07-13 David Zeuthen <davidz@redhat.com>
* tools/dbus-send.c (append_arg, type_from_name): Also support 16 and
64 bit signed and unsigned parameters
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/dbus-send.c | 32 |
2 files changed, 37 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2005-07-13 David Zeuthen <davidz@redhat.com> + + * tools/dbus-send.c (append_arg, type_from_name): Also support 16 and + 64 bit signed and unsigned parameters + 2005-07-13 John (J5) Palmieri <johnp@redhat.com> * python/.cvsignore: remove dbus_bindings.pyx, add dbus_bindings.pxd diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 477a8abd..6ab3518a 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -39,8 +39,12 @@ usage (int ecode) static void append_arg (DBusMessageIter *iter, int type, const char *value) { + dbus_uint16_t uint16; + dbus_int16_t int16; dbus_uint32_t uint32; dbus_int32_t int32; + dbus_uint64_t uint64; + dbus_int64_t int64; double d; unsigned char byte; dbus_bool_t v_BOOLEAN; @@ -58,6 +62,16 @@ append_arg (DBusMessageIter *iter, int type, const char *value) dbus_message_iter_append_basic (iter, DBUS_TYPE_DOUBLE, &d); break; + case DBUS_TYPE_INT16: + int16 = strtol (value, NULL, 0); + dbus_message_iter_append_basic (iter, DBUS_TYPE_INT16, &int16); + break; + + case DBUS_TYPE_UINT16: + uint16 = strtoul (value, NULL, 0); + dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT16, &uint16); + break; + case DBUS_TYPE_INT32: int32 = strtol (value, NULL, 0); dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &int32); @@ -68,6 +82,16 @@ append_arg (DBusMessageIter *iter, int type, const char *value) dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT32, &uint32); break; + case DBUS_TYPE_INT64: + int64 = strtoll (value, NULL, 0); + dbus_message_iter_append_basic (iter, DBUS_TYPE_INT64, &int64); + break; + + case DBUS_TYPE_UINT64: + uint64 = strtoull (value, NULL, 0); + dbus_message_iter_append_basic (iter, DBUS_TYPE_UINT64, &uint64); + break; + case DBUS_TYPE_STRING: dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &value); break; @@ -156,10 +180,18 @@ type_from_name (const char *arg) int type; if (!strcmp (arg, "string")) type = DBUS_TYPE_STRING; + else if (!strcmp (arg, "int16")) + type = DBUS_TYPE_INT16; + else if (!strcmp (arg, "uint16")) + type = DBUS_TYPE_UINT16; else if (!strcmp (arg, "int32")) type = DBUS_TYPE_INT32; else if (!strcmp (arg, "uint32")) type = DBUS_TYPE_UINT32; + else if (!strcmp (arg, "int64")) + type = DBUS_TYPE_INT64; + else if (!strcmp (arg, "uint64")) + type = DBUS_TYPE_UINT64; else if (!strcmp (arg, "double")) type = DBUS_TYPE_DOUBLE; else if (!strcmp (arg, "byte")) |