diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-05-30 15:06:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-05-30 15:29:50 -0700 |
| commit | d93f4bda7ab3a5230d9155a93e2a3759690e3101 (patch) | |
| tree | 607deec736b38dad1c5d3fa85feba318bd463701 | |
| parent | b2e44b42463bf80286063299dbb73d27a040372e (diff) | |
| download | emacs-d93f4bda7ab3a5230d9155a93e2a3759690e3101.tar.gz | |
Simplify xd_signature to pacify GCC 9
* src/dbusbind.c (xd_signature): Use simpler way to set up
the subsignature. This also pacifies GCC 9 on Fedora 30 x86-64.
Backport from master.
| -rw-r--r-- | src/dbusbind.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 6ae9bc7f538..fcb58f74489 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -346,7 +346,6 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object) int subtype; Lisp_Object elt; char const *subsig; - int subsiglen; char x[DBUS_MAXIMUM_SIGNATURE_LENGTH]; elt = object; @@ -428,10 +427,9 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object) elt = CDR_SAFE (XD_NEXT_VALUE (elt)); } - subsiglen = snprintf (signature, DBUS_MAXIMUM_SIGNATURE_LENGTH, - "%c%s", dtype, subsig); - if (! (0 <= subsiglen && subsiglen < DBUS_MAXIMUM_SIGNATURE_LENGTH)) - string_overflow (); + signature[0] = dtype; + signature[1] = '\0'; + xd_signature_cat (signature, subsig); break; case DBUS_TYPE_VARIANT: |