diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bus/connection.c | 8 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 2 | ||||
| -rw-r--r-- | test/glib/test-profile.c | 2 |
4 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2005-08-03 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): fix + typo, from Julien Puydt + + * bus/connection.c (bus_connection_disconnected): we were always + doing a wait_for_memory due to a buggy loop, found by Timo Hoenig + 2005-08-01 Colin Walters <walters@verbum.org> Patch from Joe Markus Clarke: diff --git a/bus/connection.c b/bus/connection.c index 2e3675f9..90c6b75b 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -199,12 +199,8 @@ bus_connection_disconnected (DBusConnection *connection) dbus_error_init (&error); - transaction = NULL; - while (transaction == NULL) - { - transaction = bus_transaction_new (d->connections->context); - _dbus_wait_for_memory (); - } + while ((transaction = bus_transaction_new (d->connections->context)) == NULL) + _dbus_wait_for_memory (); if (!bus_service_remove_owner (service, connection, transaction, &error)) diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index b1404e43..4ad4497d 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -892,7 +892,7 @@ _dbus_read_credentials_unix_socket (int client_fd, } #ifdef HAVE_CMSGCRED - if (cmsg->hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) + if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c index 21d58852..9f63b36b 100644 --- a/test/glib/test-profile.c +++ b/test/glib/test-profile.c @@ -48,7 +48,7 @@ */ #define N_CLIENT_THREADS 1 /* It seems like at least 750000 or so iterations reduces the variability to sane levels */ -#define N_ITERATIONS 25000 +#define N_ITERATIONS 2000 #define N_PROGRESS_UPDATES 20 /* Don't make PAYLOAD_SIZE too huge because it gets used as a static buffer size */ #define PAYLOAD_SIZE 0 |