diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-24 18:37:16 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-24 18:37:16 +0000 |
| commit | cc73b3da32ff6d4bebe9013b812f2845ad282cf7 (patch) | |
| tree | 6c82eeaeaeb65911a2de97688660f5d4e6a15d71 /dbus/dbus-signature.c | |
| parent | 54a2e9f7961b4b8afff94bb0c5b756f986965be6 (diff) | |
2005-02-24 Havoc Pennington <hp@redhat.com>
* dbus/dbus-server.c, dbus/dbus-server-unix.c: change semantics so
you must disconnect before unref, since locking and other things
are screwed up otherwise. Fix assorted other locking stuff.
* dbus/dbus-signature.c (dbus_signature_iter_get_element_type):
fix compilation
* dbus/dbus-threads-internal.h: move the mutex/condvar wrappers
into a private header and don't export from the library
* throughout - call _dbus_thread_stuff vs. dbus_thread_stuff
Diffstat (limited to 'dbus/dbus-signature.c')
| -rw-r--r-- | dbus/dbus-signature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c index c984bcfd..698c21ed 100644 --- a/dbus/dbus-signature.c +++ b/dbus/dbus-signature.c @@ -97,7 +97,7 @@ dbus_signature_iter_get_element_type (const DBusSignatureIter *iter) { DBusSignatureRealIter *real_iter = (DBusSignatureRealIter *) iter; - _dbus_retur(dbus_signature_iter_get_current_type (iter) == DBUS_TYPE_ARRAY); + _dbus_return_val_if_fail (dbus_signature_iter_get_current_type (iter) == DBUS_TYPE_ARRAY, DBUS_TYPE_INVALID); return _dbus_first_type_in_signature_c_str (real_iter->pos, 1); } |