From 2a866e7b9881176980c0a4acb998e1625aabf87f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 27 Apr 2011 17:48:19 -0700 Subject: * dbusbind.c: Don't possibly lose pointer info when converting. (xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages): Use XPNTR rather than XHASH, so that the high-order bits of the pointer aren't lost when converting through void *. --- src/dbusbind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dbusbind.c') diff --git a/src/dbusbind.c b/src/dbusbind.c index 4c0b9bd017..06feec3e79 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -892,7 +892,7 @@ xd_remove_watch (DBusWatch *watch, void *data) return; /* Unset session environment. */ - if (data != NULL && data == (void*) XHASH (QCdbus_session_bus)) + if (data != NULL && data == (void *) XPNTR (QCdbus_session_bus)) { XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS"); unsetenv ("DBUS_SESSION_BUS_ADDRESS"); @@ -929,7 +929,7 @@ DEFUN ("dbus-init-bus", Fdbus_init_bus, Sdbus_init_bus, 1, 1, 0, xd_add_watch, xd_remove_watch, xd_toggle_watch, - (void*) XHASH (bus), NULL)) + (void *) XPNTR (bus), NULL)) XD_SIGNAL1 (build_string ("Cannot add watch functions")); /* Add bus to list of registered buses. */ @@ -1824,7 +1824,7 @@ xd_read_queued_messages (int fd, void *data, int for_read) if (data != NULL) while (!NILP (busp)) { - if (data == (void*) XHASH (CAR_SAFE (busp))) + if (data == (void *) XPNTR (CAR_SAFE (busp))) bus = CAR_SAFE (busp); busp = CDR_SAFE (busp); } -- cgit v1.2.3