diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-10-28 01:41:37 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-10-28 01:41:37 +0000 |
| commit | eaefe03a8891b84e3f9e1f99f9098d65567e3092 (patch) | |
| tree | 4704a6dac805f85df83593a435fb90c28e3163b9 /dbus/dbus-sysdeps-pthread.c | |
| parent | feb7d3a0f0e2404e81fbe6252864ab599e1fa38d (diff) | |
2006-10-27 Havoc Pennington <hp@redhat.com>
* dbus/dbus-test.c: enclose more of the file in the
DBUS_BUILD_TESTS check.
* dbus/dbus-sysdeps-pthread.c (PTHREAD_CHECK): fix for
DBUS_DISABLE_ASSERT case.
* dbus/dbus-connection.c (dbus_connection_get_unix_user): document
that it only works on the server side
* dbus/dbus-bus.c: add a global lock covering the BusData we
attach to each connection
(internal_bus_get): lock our access to the BusData
(dbus_bus_register): lock the entire registration process
with _DBUS_LOCK(bus_datas). If we get the lock and
registration is already complete, silently return (vs. previous
behavior of aborting).
(dbus_bus_set_unique_name): lock the BusData
(dbus_bus_get_unique_name): lock the BusData
Diffstat (limited to 'dbus/dbus-sysdeps-pthread.c')
| -rw-r--r-- | dbus/dbus-sysdeps-pthread.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c index fc2acd40..2f33b1c4 100644 --- a/dbus/dbus-sysdeps-pthread.c +++ b/dbus/dbus-sysdeps-pthread.c @@ -50,8 +50,9 @@ typedef struct { #ifdef DBUS_DISABLE_ASSERT -#define PTHREAD_CHECK(func_name, result_or_call) do { \ - do { (result_or_call) } while (0) +/* (tmp != 0) is a no-op usage to silence compiler */ +#define PTHREAD_CHECK(func_name, result_or_call) \ + do { int tmp = (result_or_call); if (tmp != 0) {;} } while (0) #else #define PTHREAD_CHECK(func_name, result_or_call) do { \ int tmp = (result_or_call); \ |