procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify xd_signature to pacify GCC 9

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2019-05-30 15:06:39 -07:00
parent b2e44b4246
commit d93f4bda7a
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dbusbind.c
View file

@ -346,7 +346,6 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
int subtype; int subtype;
Lisp_Object elt; Lisp_Object elt;
char const *subsig; char const *subsig;
int subsiglen;
char x[DBUS_MAXIMUM_SIGNATURE_LENGTH]; char x[DBUS_MAXIMUM_SIGNATURE_LENGTH];
elt = object; 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)); elt = CDR_SAFE (XD_NEXT_VALUE (elt));
} }
subsiglen = snprintf (signature, DBUS_MAXIMUM_SIGNATURE_LENGTH, signature[0] = dtype;
"%c%s", dtype, subsig); signature[1] = '\0';
if (! (0 <= subsiglen && subsiglen < DBUS_MAXIMUM_SIGNATURE_LENGTH)) xd_signature_cat (signature, subsig);
string_overflow ();
break; break;
case DBUS_TYPE_VARIANT: case DBUS_TYPE_VARIANT: