diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-23 19:06:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-23 19:06:12 -0700 |
| commit | 30217ff0cf028810c4f7c6d3b0324e2dfaf2c131 (patch) | |
| tree | 573300bd6c92de41c736cb812b5aee8993cc33f2 /src/dbusbind.c | |
| parent | 2d1fc3c73cd8b771cbfb1114f7f85dc0273d24e3 (diff) | |
* dbusbind.c (xd_read_message_1): Don't assume dbus_uint32_t can fit in int.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 0de3061380..50f70f9b9e 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1663,7 +1663,9 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) DBusMessage *dmessage; DBusMessageIter iter; unsigned int dtype; - int mtype, serial; + int mtype; + dbus_uint32_t serial; + unsigned int userial; const char *uname, *path, *interface, *member; dmessage = dbus_connection_pop_message (connection); @@ -1692,7 +1694,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) /* Read message type, message serial, unique name, object path, interface and member from the message. */ mtype = dbus_message_get_type (dmessage); - serial = + userial = serial = ((mtype == DBUS_MESSAGE_TYPE_METHOD_RETURN) || (mtype == DBUS_MESSAGE_TYPE_ERROR)) ? dbus_message_get_reply_serial (dmessage) @@ -1702,7 +1704,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) interface = dbus_message_get_interface (dmessage); member = dbus_message_get_member (dmessage); - XD_DEBUG_MESSAGE ("Event received: %s %d %s %s %s %s %s", + XD_DEBUG_MESSAGE ("Event received: %s %u %s %s %s %s %s", (mtype == DBUS_MESSAGE_TYPE_INVALID) ? "DBUS_MESSAGE_TYPE_INVALID" : (mtype == DBUS_MESSAGE_TYPE_METHOD_CALL) @@ -1712,7 +1714,7 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus) : (mtype == DBUS_MESSAGE_TYPE_ERROR) ? "DBUS_MESSAGE_TYPE_ERROR" : "DBUS_MESSAGE_TYPE_SIGNAL", - serial, uname, path, interface, member, + userial, uname, path, interface, member, SDATA (format2 ("%s", args, Qnil))); if ((mtype == DBUS_MESSAGE_TYPE_METHOD_RETURN) |