Module Name: xsrc
Committed By: joerg
Date: Sun Feb 28 15:22:35 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
Log Message:
Avoid non-literal format string warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4 Thu Mar 20 01:04:22 2014
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Sun Feb 28 15:22:34 2016
@@ -423,7 +423,7 @@ static void
SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
{
va_list ap;
- static const char *str = "**************************************************\n";
+ static const char str[] = "**************************************************\n";
va_start(ap, format);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
@@ -1782,7 +1782,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr
DisplayModePtr currentMode, firstMode;
Bool infochanged = FALSE;
Bool usenonrect = pSiS->NonRect;
- const char *rectxine = "\t... setting up rectangular Xinerama layout\n";
+ static const char rectxine[] = "\t... setting up rectangular Xinerama layout\n";
pSiS->MBXNR1XMAX = pSiS->MBXNR1YMAX = pSiS->MBXNR2XMAX = pSiS->MBXNR2YMAX = 65536;
pSiS->HaveNonRect = pSiS->HaveOffsRegions = FALSE;