summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-11-21 22:21:18 (GMT)
committerPeter Hutterer <peter.hutterer@who-t.net>2013-11-22 23:43:15 (GMT)
commit49796d6a3274adc0250ee07faa6bc63e41c98740 (patch)
tree0b78ea76bf64d7e9a2ee6be726229ad8a1934a4a
parent0a4336efaafac4c34d4287b5df586bbb418f7f76 (diff)
Fix format-security warnings
sis_driver.c: In function 'SISErrorLog': sis_driver.c:432:5: error: format not a string literal and no format arguments [-Werror=format-security] xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ^ sis_driver.c:439:5: error: format not a string literal and no format arguments [-Werror=format-security] xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ^ sis_driver.c: In function 'SiSUpdateXineramaScreenInfo': sis_driver.c:1917:4: error: format not a string literal and no format arguments [-Werror=format-security] xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); ^ sis_driver.c:1924:8: error: format not a string literal and no format arguments [-Werror=format-security] xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/sis_driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 80b8d51..bd9c4e1 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -429,14 +429,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
static const char *str = "**************************************************\n";
va_start(ap, format);
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
" ERROR:\n");
xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
va_end(ap);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
" END OF MESSAGE\n");
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
}
static void
@@ -1914,14 +1914,14 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
if(infochanged && !usenonrect) {
xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
"Virtual screen size does not match maximum display modes...\n");
- xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+ xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
}
} else if(infochanged && usenonrect) {
usenonrect = FALSE;
xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
"Only clone modes available for this virtual screen size...\n");
- xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+ xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
}
if(pSiS->maxCRT1_X1) { /* Means we have at least one non-clone mode */