[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105659: * dbusbind.c (xd_signature_c
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105659: * dbusbind.c (xd_signature_cat): Rename from signature_cat. |
Date: |
Mon, 05 Sep 2011 11:34:18 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105659
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-05 11:34:18 +0200
message:
* dbusbind.c (xd_signature_cat): Rename from signature_cat.
modified:
src/ChangeLog
src/dbusbind.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-09-04 19:18:28 +0000
+++ b/src/ChangeLog 2011-09-05 09:34:18 +0000
@@ -1,3 +1,7 @@
+2011-09-05 Michael Albinus <address@hidden>
+
+ * dbusbind.c (xd_signature_cat): Rename from signature_cat.
+
2011-09-04 Paul Eggert <address@hidden>
sprintf-related integer and memory overflow issues (Bug#9412).
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2011-09-01 14:44:49 +0000
+++ b/src/dbusbind.c 2011-09-05 09:34:18 +0000
@@ -262,7 +262,7 @@
/* Append to SIGNATURE a copy of X, making sure SIGNATURE does
not become too long. */
static void
-signature_cat (char *signature, char const *x)
+xd_signature_cat (char *signature, char const *x)
{
ptrdiff_t siglen = strlen (signature);
ptrdiff_t xlen = strlen (x);
@@ -401,10 +401,10 @@
{
subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt));
xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
- signature_cat (signature, x);
+ xd_signature_cat (signature, x);
elt = CDR_SAFE (XD_NEXT_VALUE (elt));
}
- signature_cat (signature, DBUS_STRUCT_END_CHAR_AS_STRING);
+ xd_signature_cat (signature, DBUS_STRUCT_END_CHAR_AS_STRING);
break;
case DBUS_TYPE_DICT_ENTRY:
@@ -425,7 +425,7 @@
elt = XD_NEXT_VALUE (elt);
subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt));
xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
- signature_cat (signature, x);
+ xd_signature_cat (signature, x);
if (!XD_BASIC_DBUS_TYPE (subtype))
wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt)));
@@ -434,14 +434,14 @@
elt = CDR_SAFE (XD_NEXT_VALUE (elt));
subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt));
xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
- signature_cat (signature, x);
+ xd_signature_cat (signature, x);
if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt))))
wrong_type_argument (intern ("D-Bus"),
CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt))));
/* Closing signature. */
- signature_cat (signature, DBUS_DICT_ENTRY_END_CHAR_AS_STRING);
+ xd_signature_cat (signature, DBUS_DICT_ENTRY_END_CHAR_AS_STRING);
break;
default:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105659: * dbusbind.c (xd_signature_cat): Rename from signature_cat.,
Michael Albinus <=