[Emacs-diffs] emacs-26 d93f4bd 3/5: Simplify xd_signature to pacify GCC 9

[Paul Eggert]

branch: emacs-26
commit d93f4bda7ab3a5230d9155a93e2a3759690e3101
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/dbusbind.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 6ae9bc7..fcb58f7 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: