frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmx: move format strings inline so gcc can check 

Gets rid of gcc 4.8 warnings:

dmxprint.c: In function ‘dmxConfigPrintPair’:
dmxprint.c:284:25: warning: format not a string literal,
  argument types not checked [-Wformat-nonliteral]
                         p->ysign < 0 ? '-' : '+', p->y);
                         ^
dmxprint.c:289:9: warning: format not a string literal,
  argument types not checked [-Wformat-nonliteral]
         dmxConfigOutput(addSpace, 0, p->comment, format, p->x, p->y);
         ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Alan Coopersmith 2014-12-12 18:58:01 -08:00
parent 5e01eac10e
commit 11af200b00
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/dmx/config/dmxprint.c
View File

@ -261,32 +261,20 @@ dmxConfigPrintString(DMXConfigStringPtr p, int quote)
static int static int
dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace) dmxConfigPrintPair(DMXConfigPairPtr p, int addSpace)
{ {
const char *format = NULL;
if (!p) if (!p)
return 0; return 0;
switch (p->token) {
case T_ORIGIN:
format = "@%dx%d";
break;
case T_DIMENSION:
format = "%dx%d";
break;
case T_OFFSET:
format = "%c%d%c%d";
break;
}
if (p->token == T_OFFSET) { if (p->token == T_OFFSET) {
if (!p->comment && !p->x && !p->y && p->xsign >= 0 && p->ysign >= 0) if (!p->comment && !p->x && !p->y && p->xsign >= 0 && p->ysign >= 0)
return 0; return 0;
dmxConfigOutput(addSpace, 0, p->comment, format, dmxConfigOutput(addSpace, 0, p->comment, "%c%d%c%d",
p->xsign < 0 ? '-' : '+', p->x, p->xsign < 0 ? '-' : '+', p->x,
p->ysign < 0 ? '-' : '+', p->y); p->ysign < 0 ? '-' : '+', p->y);
} }
else { else {
if (!p->comment && !p->x && !p->y) if (!p->comment && !p->x && !p->y)
return 0; return 0;
dmxConfigOutput(addSpace, 0, p->comment, format, p->x, p->y); dmxConfigOutput(addSpace, 0, p->comment, "%s%dx%d",
(p->token == T_ORIGIN) ? "@" : "", p->x, p->y);
} }
return 1; return 1;
} }