Bug 891276: Removed unused function dbus_returns_uint32, r=echou
authorThomas Zimmermann <tdz@users.sourceforge.net>
Thu, 11 Jul 2013 09:58:53 +0200
changeset 138833 e8fe3e9edb4edcb9ddd4bafba1f74bfe3b2b34cc
parent 138832 a1b370105e04de8ad0ab6172a197d69f5ca206fa
child 138834 15161bb03b352f562c8f008658389b5d1d5eed12
push idunknown
push userunknown
push dateunknown
reviewersechou
bugs891276
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 891276: Removed unused function dbus_returns_uint32, r=echou AddServiceRecords was the only user of this function. This patch cleans it up.
ipc/dbus/DBusUtils.cpp
ipc/dbus/DBusUtils.h
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -625,32 +625,16 @@ int dbus_returns_int32(DBusMessage *repl
                              DBUS_TYPE_INT32, &ret,
                              DBUS_TYPE_INVALID)) {
     LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
   }
 
   return ret;
 }
 
-int dbus_returns_uint32(DBusMessage *reply)
-{
-  DBusError err;
-  uint32_t ret = -1;
-
-  dbus_error_init(&err);
-  if (!dbus_message_get_args(reply, &err,
-                             DBUS_TYPE_UINT32, &ret,
-                             DBUS_TYPE_INVALID)) {
-    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
-  }
-
-  dbus_message_unref(reply);
-  return ret;
-}
-
 void DBusReplyHandler::Callback(DBusMessage* aReply, void* aData)
 {
   MOZ_ASSERT(aData);
 
   nsRefPtr<DBusReplyHandler> handler =
     already_AddRefed<DBusReplyHandler>(static_cast<DBusReplyHandler*>(aData));
 
   handler->Handle(aReply);
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -158,15 +158,13 @@ DBusMessage*  dbus_func_args_timeout_val
                                             const char* path,
                                             const char* ifc,
                                             const char* func,
                                             int first_arg_type,
                                             va_list args);
 
 int dbus_returns_int32(DBusMessage *reply);
 
-int dbus_returns_uint32(DBusMessage *reply);
-
 }
 }
 
 #endif