diff options
| author | Michael Albinus | 2008-04-13 16:29:55 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-04-13 16:29:55 +0000 |
| commit | 48f7d2134fc8503360449814b283c817cd1a608b (patch) | |
| tree | 8d41ade88ff8a71a4cd2b49a81a381126a17ce6f /src | |
| parent | 017c22fe4b4f06e37caae6a405dd9a85016c21d1 (diff) | |
| download | emacs-48f7d2134fc8503360449814b283c817cd1a608b.tar.gz emacs-48f7d2134fc8503360449814b283c817cd1a608b.zip | |
* dbusbind.c (dbus-get-unique-name): Remove extra copying of name string.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dbusbind.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e4e11b296f3..756fa6f47ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-04-13 David Hansen <david.hansen@gmx.net> (tiny change) | ||
| 2 | |||
| 3 | * dbusbind.c (dbus-get-unique-name): Remove extra copying of name | ||
| 4 | string. | ||
| 5 | |||
| 1 | 2008-04-12 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2008-04-12 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | * m/hp800.h (XUINT, XSET): Remove. | 8 | * 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, | |||
| 701 | Lisp_Object bus; | 701 | Lisp_Object bus; |
| 702 | { | 702 | { |
| 703 | DBusConnection *connection; | 703 | DBusConnection *connection; |
| 704 | char name[DBUS_MAXIMUM_NAME_LENGTH]; | 704 | const char *name; |
| 705 | 705 | ||
| 706 | /* Check parameters. */ | 706 | /* Check parameters. */ |
| 707 | CHECK_SYMBOL (bus); | 707 | CHECK_SYMBOL (bus); |
| @@ -710,7 +710,7 @@ DEFUN ("dbus-get-unique-name", Fdbus_get_unique_name, Sdbus_get_unique_name, | |||
| 710 | connection = xd_initialize (bus); | 710 | connection = xd_initialize (bus); |
| 711 | 711 | ||
| 712 | /* Request the name. */ | 712 | /* Request the name. */ |
| 713 | strcpy (name, dbus_bus_get_unique_name (connection)); | 713 | name = dbus_bus_get_unique_name (connection); |
| 714 | if (name == NULL) | 714 | if (name == NULL) |
| 715 | xsignal1 (Qdbus_error, build_string ("No unique name available")); | 715 | xsignal1 (Qdbus_error, build_string ("No unique name available")); |
| 716 | 716 | ||
| @@ -729,8 +729,8 @@ offered by SERVICE. It must provide METHOD. | |||
| 729 | 729 | ||
| 730 | If the parameter `:timeout' is given, the following integer TIMEOUT | 730 | If the parameter `:timeout' is given, the following integer TIMEOUT |
| 731 | specifies the maximun number of milliseconds the method call must | 731 | specifies the maximun number of milliseconds the method call must |
| 732 | return. The default value is 25.000. If the method call doesn't return | 732 | return. The default value is 25.000. If the method call doesn't |
| 733 | in time, a D-Bus error is raised. | 733 | return in time, a D-Bus error is raised. |
| 734 | 734 | ||
| 735 | All other arguments ARGS are passed to METHOD as arguments. They are | 735 | All other arguments ARGS are passed to METHOD as arguments. They are |
| 736 | converted into D-Bus types via the following rules: | 736 | converted into D-Bus types via the following rules: |