From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 24 May 2011 07:41:16 +0000 (-0700)
Subject: * dbusbind.c (xd_invalid_serial): Remove. (Bug#8722)
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~139^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b57f7e0a357aacf98ec5be826f7227f37e9806b8;p=emacs.git

* dbusbind.c (xd_invalid_serial): Remove. (Bug#8722)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a905fd3c403..d276e309c50 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,6 @@
 
 	* dbusbind.c: Serial number integer overflow fixes.
 	(CHECK_DBUS_SERIAL_GET_SERIAL): New macro.
-	(xd_invalid_serial): New static function.
 	(Fdbus_call_method_asynchronously, xd_read_message_1): Use a float
 	to hold a serial number that is too large for a fixnum.
 	(Fdbus_method_return_internal, Fdbus_method_error_internal):
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 9df7f443d7d..d8d0c7c2ef0 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -256,17 +256,10 @@ xd_symbol_to_dbus_type (Lisp_Object object)
 	       && XFLOAT_DATA (x) <= DBUS_SERIAL_MAX)			\
 	serial = XFLOAT_DATA (x);					\
       else								\
-	xd_invalid_serial (x);						\
+	XD_SIGNAL2 (build_string ("Invalid dbus serial"), x);		\
     }									\
   while (0)
 
-static void xd_invalid_serial (Lisp_Object) NO_RETURN;
-static void
-xd_invalid_serial (Lisp_Object x)
-{
-  signal_error ("Invalid dbus serial", x);
-}
-
 /* Compute SIGNATURE of OBJECT.  It must have a form that it can be
    used in dbus_message_iter_open_container.  DTYPE is the DBusType
    the object is related to.  It is passed as argument, because it