From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 13 Apr 2008 16:29:55 +0000 (+0000)
Subject: * dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
X-Git-Tag: emacs-pretest-23.0.90~6295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48f7d2134fc8503360449814b283c817cd1a608b;p=emacs.git

* dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e4e11b296f3..756fa6f47ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-13  David Hansen  <david.hansen@gmx.net>  (tiny change)
+
+	* dbusbind.c (dbus-get-unique-name): Remove extra copying of name
+	string.
+
 2008-04-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* m/hp800.h (XUINT, XSET): Remove.
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 07711053560..fb49c5425f0 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -701,7 +701,7 @@ DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name,
      Lisp_Object bus;
 {
   DBusConnection *connection;
-  char name[DBUS_MAXIMUM_NAME_LENGTH];
+  const char *name;
 
   /* Check parameters.  */
   CHECK_SYMBOL (bus);
@@ -710,7 +710,7 @@ DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name,
   connection = xd_initialize (bus);
 
   /* Request the name.  */
-  strcpy (name, dbus_bus_get_unique_name (connection));
+  name = dbus_bus_get_unique_name (connection);
   if (name == NULL)
     xsignal1 (Qdbus_error, build_string ("No unique name available"));
 
@@ -729,8 +729,8 @@ offered by SERVICE.  It must provide METHOD.
 
 If the parameter `:timeout' is given, the following integer TIMEOUT
 specifies the maximun number of milliseconds the method call must
-return. The default value is 25.000. If the method call doesn't return
-in time, a D-Bus error is raised.
+return.  The default value is 25.000.  If the method call doesn't
+return in time, a D-Bus error is raised.
 
 All other arguments ARGS are passed to METHOD as arguments.  They are
 converted into D-Bus types via the following rules: