Attachment 6941 Details for Bug 8150 – dbus-mutex-check-return-value.patch

[patch] dbus-mutex-check-return-value.patch

dbus-mutex-check-return-value.patch (text/plain), 2.06 KB, created by frederic heem on 2006-09-13 01:53:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: frederic heem

Created: 2006-09-13 01:53:42 UTC

Size: 2.06 KB

patch

obsolete

>? dbus-connection-fix.bin
>? dbus-mutex-check-return-value.patch
>? test/name-test/.deps
>? test/name-test/.libs
>? test/name-test/Makefile
>? test/name-test/Makefile.in
>? test/name-test/run-with-tmp-session-bus.conf
>? test/name-test/test-names
>? test/name-test/test-pending-call-dispatch
>? test/name-test/test-threads-init
>Index: INSTALL
>===================================================================
>RCS file: /cvs/dbus/dbus/INSTALL,v
>retrieving revision 1.4
>diff -u -r1.4 INSTALL
>--- INSTALL	24 Apr 2006 15:28:42 -0000	1.4
>+++ INSTALL	13 Sep 2006 08:51:11 -0000
>@@ -7,7 +7,7 @@
> DBus uses GNU AutoTools for its build system, thus the basic install
> procedure can be summarized as:
> 
>-    ./configure --prefix=/usr
>+    ./configure --enable-verbose-mode --enable-asserts --enable-checks --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-tests
>     make
>     su make install
> 
>Index: dbus/dbus-threads.c
>===================================================================
>RCS file: /cvs/dbus/dbus/dbus/dbus-threads.c,v
>retrieving revision 1.27
>diff -u -r1.27 dbus-threads.c
>--- dbus/dbus-threads.c	18 Aug 2006 20:24:56 -0000	1.27
>+++ dbus/dbus-threads.c	13 Sep 2006 08:51:12 -0000
>@@ -135,10 +135,14 @@
> dbus_bool_t
> _dbus_mutex_lock (DBusMutex *mutex)
> {
>-  if (mutex && thread_functions.mutex_lock)
>-    return (* thread_functions.mutex_lock) (mutex);
>-  else
>-    return TRUE;
>+  dbus_bool_t return_value;
>+  if (mutex && thread_functions.mutex_lock){
>+    return_value = (* thread_functions.mutex_lock) (mutex);
>+  } else {
>+    return_value = TRUE;
>+  }
>+  _dbus_assert(return_value == TRUE);
>+  return return_value;
> }
> 
> /**
>@@ -149,10 +153,14 @@
> dbus_bool_t
> _dbus_mutex_unlock (DBusMutex *mutex)
> {
>-  if (mutex && thread_functions.mutex_unlock)
>-    return (* thread_functions.mutex_unlock) (mutex);
>-  else
>-    return TRUE;
>+  dbus_bool_t return_value;
>+  if (mutex && thread_functions.mutex_unlock){
>+    return_value = (* thread_functions.mutex_unlock) (mutex);
>+  } else {
>+    return_value = TRUE;
>+  }
>+  _dbus_assert(return_value == TRUE);
>+  return return_value;
> }
> 
> /**

Actions: View | Splinter Review

Attachments on bug 8150: 6846 | 6847 | 6856 | 6940 | 6941

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.