diff options
| author | Michael Albinus | 2011-09-05 11:34:18 +0200 |
|---|---|---|
| committer | Michael Albinus | 2011-09-05 11:34:18 +0200 |
| commit | ecfc0a490102d59a6b66a85f12639769a233e4fb (patch) | |
| tree | b210ecfe020935fb80f6e19cba83526cf830ad53 /src/dbusbind.c | |
| parent | f62bd846552a090f3ba5e136d6d9cdb4c07ed7be (diff) | |
| download | emacs-ecfc0a490102d59a6b66a85f12639769a233e4fb.tar.gz emacs-ecfc0a490102d59a6b66a85f12639769a233e4fb.zip | |
* dbusbind.c (xd_signature_cat): Rename from signature_cat.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 8dac2a6249f..2a38d15873c 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -262,7 +262,7 @@ xd_symbol_to_dbus_type (Lisp_Object object) | |||
| 262 | /* Append to SIGNATURE a copy of X, making sure SIGNATURE does | 262 | /* Append to SIGNATURE a copy of X, making sure SIGNATURE does |
| 263 | not become too long. */ | 263 | not become too long. */ |
| 264 | static void | 264 | static void |
| 265 | signature_cat (char *signature, char const *x) | 265 | xd_signature_cat (char *signature, char const *x) |
| 266 | { | 266 | { |
| 267 | ptrdiff_t siglen = strlen (signature); | 267 | ptrdiff_t siglen = strlen (signature); |
| 268 | ptrdiff_t xlen = strlen (x); | 268 | ptrdiff_t xlen = strlen (x); |
| @@ -401,10 +401,10 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis | |||
| 401 | { | 401 | { |
| 402 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); | 402 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
| 403 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); | 403 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
| 404 | signature_cat (signature, x); | 404 | xd_signature_cat (signature, x); |
| 405 | elt = CDR_SAFE (XD_NEXT_VALUE (elt)); | 405 | elt = CDR_SAFE (XD_NEXT_VALUE (elt)); |
| 406 | } | 406 | } |
| 407 | signature_cat (signature, DBUS_STRUCT_END_CHAR_AS_STRING); | 407 | xd_signature_cat (signature, DBUS_STRUCT_END_CHAR_AS_STRING); |
| 408 | break; | 408 | break; |
| 409 | 409 | ||
| 410 | case DBUS_TYPE_DICT_ENTRY: | 410 | case DBUS_TYPE_DICT_ENTRY: |
| @@ -425,7 +425,7 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis | |||
| 425 | elt = XD_NEXT_VALUE (elt); | 425 | elt = XD_NEXT_VALUE (elt); |
| 426 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); | 426 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
| 427 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); | 427 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
| 428 | signature_cat (signature, x); | 428 | xd_signature_cat (signature, x); |
| 429 | 429 | ||
| 430 | if (!XD_BASIC_DBUS_TYPE (subtype)) | 430 | if (!XD_BASIC_DBUS_TYPE (subtype)) |
| 431 | wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt))); | 431 | wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt))); |
| @@ -434,14 +434,14 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis | |||
| 434 | elt = CDR_SAFE (XD_NEXT_VALUE (elt)); | 434 | elt = CDR_SAFE (XD_NEXT_VALUE (elt)); |
| 435 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); | 435 | subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); |
| 436 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); | 436 | xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); |
| 437 | signature_cat (signature, x); | 437 | xd_signature_cat (signature, x); |
| 438 | 438 | ||
| 439 | if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) | 439 | if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt)))) |
| 440 | wrong_type_argument (intern ("D-Bus"), | 440 | wrong_type_argument (intern ("D-Bus"), |
| 441 | CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); | 441 | CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt)))); |
| 442 | 442 | ||
| 443 | /* Closing signature. */ | 443 | /* Closing signature. */ |
| 444 | signature_cat (signature, DBUS_DICT_ENTRY_END_CHAR_AS_STRING); | 444 | xd_signature_cat (signature, DBUS_DICT_ENTRY_END_CHAR_AS_STRING); |
| 445 | break; | 445 | break; |
| 446 | 446 | ||
| 447 | default: | 447 | default: |