[lib-fix] If error -1 should be returned by kdbus_decode_msg

[platform/upstream/dbus.git] / bus / utils.c

diff --git a/bus/utils.c b/bus/utils.c
index 8a68d8a..7d24872 100644 (file)
--- a/bus/utils.c
+++ b/bus/utils.c
@@ -1,10 +1,10 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* utils.c  General utility functions
  *
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,28 +18,18 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #include <config.h>
 #include "utils.h"
 #include <dbus/dbus-sysdeps.h>
+#include <dbus/dbus-mainloop.h>
 
 const char bus_no_memory_message[] = "Memory allocation failure in message bus";
 
 void
-bus_wait_for_memory (void)
-{
-#ifdef DBUS_BUILD_TESTS
-  /* make tests go fast */
-  _dbus_sleep_milliseconds (10);
-#else
-  _dbus_sleep_milliseconds (500);
-#endif
-}
-
-void
 bus_connection_dispatch_all_messages (DBusConnection *connection)
 {
   while (bus_connection_dispatch_one_message (connection))
@@ -52,7 +42,7 @@ bus_connection_dispatch_one_message  (DBusConnection *connection)
   DBusDispatchStatus status;
 
   while ((status = dbus_connection_dispatch (connection)) == DBUS_DISPATCH_NEED_MEMORY)
-    bus_wait_for_memory ();
+    _dbus_wait_for_memory ();
   
   return status == DBUS_DISPATCH_DATA_REMAINS;
 }