From 74e17c23ae085026cb089cbbb89c56e890bb29c4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 May 2019 12:14:38 -0700 Subject: [PATCH] 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. --- src/dbusbind.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/dbusbind.c b/src/dbusbind.c index 0afae6b05ad..850d176c08f 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; @@ -430,10 +429,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: -- 2.39.2