diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-09 12:55:19 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-09 12:55:19 -0800 |
| commit | f6ffb479c3eda868f4349821502a65d0286c3e5f (patch) | |
| tree | 1f14218553a1244e28309e78a8d319896c1cc004 | |
| parent | aa970d8d25e26116c7f87a09c0ed88e215328929 (diff) | |
Fix -Wdiscarded-qualifiers warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/xgi_driver.c | 7 | ||||
| -rw-r--r-- | src/xgi_opt.c | 8 | ||||
| -rw-r--r-- | src/xgi_setup.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/xgi_driver.c b/src/xgi_driver.c index bbf5203..899e3d3 100644 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -1022,7 +1022,7 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, * (Code base taken from mga driver) */ static DisplayModePtr -XGIGetModeFromName(char *str, DisplayModePtr i) +XGIGetModeFromName(const char *str, DisplayModePtr i) { DisplayModePtr c = i; if (!i) @@ -1447,7 +1447,7 @@ XGIInternalDDC(ScrnInfoPtr pScrn, int crtno) pScrn->monitor->widthmm = 310; pScrn->monitor->heightmm = 240; - static char *crtno_means_str[] = { + static const char *crtno_means_str[] = { "CRT1", "DVI", "CRT2" }; @@ -2305,11 +2305,10 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) if (!(newm = malloc(sizeof(DisplayModeRec)))) break; memcpy(newm, tempm, sizeof(DisplayModeRec)); - if (!(newm->name = malloc(strlen(tempm->name) + 1))) { + if (!(newm->name = strdup(tempm->name))) { free(newm); break; } - strcpy(newm->name, tempm->name); if (!pXGI->CRT2pScrn->monitor->Modes) pXGI->CRT2pScrn->monitor->Modes = newm; if (currentm) { diff --git a/src/xgi_opt.c b/src/xgi_opt.c index beeb479..29bd79f 100644 --- a/src/xgi_opt.c +++ b/src/xgi_opt.c @@ -300,14 +300,14 @@ xgiOptions(ScrnInfoPtr pScrn) pXGI->Non_DDC_DefaultRefreshRate = 60; char ModeStringFormat[32] = "%[^x]x%[^@]@%[^\n]" /* "%[^x]+%[^@]+%[^H^z]" */; - char* Non_DDCDefaultMode = ""; + const char* Non_DDCDefaultMode = ""; char Non_DDCDefaultResolutionX[8] = ""; char Non_DDCDefaultResolutionY[8] = ""; char Non_DDCDefaultRefreshRate[8] = ""; /* strcpy(ModeStringFormat, "%[^+]x%[^+]@%[^\n]"); */ - if((Non_DDCDefaultMode = (char *)xf86GetOptValString(pXGI->Options, OPTION_NONDDC_DEFAULT_MODE))) + if((Non_DDCDefaultMode = xf86GetOptValString(pXGI->Options, OPTION_NONDDC_DEFAULT_MODE))) { sscanf(Non_DDCDefaultMode, ModeStringFormat, Non_DDCDefaultResolutionX , @@ -344,12 +344,12 @@ xgiOptions(ScrnInfoPtr pScrn) g_GammaRed = g_GammaGreen = g_GammaBlue = 1000; char GammaStringFormat[32] = "%[^,],%[^,],%[^\n]"; - char* GammaRGB = ""; + const char* GammaRGB = ""; char GammaRed[8] = ""; char GammaGreen[8] = ""; char GammaBlue[8] = ""; - if((GammaRGB = (char *)xf86GetOptValString(pXGI->Options, OPTION_GAMMA_RGB))) + if((GammaRGB = xf86GetOptValString(pXGI->Options, OPTION_GAMMA_RGB))) { ErrorF("GammaRGB is (%s) from xorg.conf\n", GammaRGB); sscanf(GammaRGB, GammaStringFormat, diff --git a/src/xgi_setup.c b/src/xgi_setup.c index 4d9724a..69ee862 100644 --- a/src/xgi_setup.c +++ b/src/xgi_setup.c @@ -95,7 +95,7 @@ xgiXG2X_Setup(ScrnInfoPtr pScrn) unsigned int ulMemConfig = 0; unsigned long ulMemSize = 0; unsigned long ulDramType = 0; - char *dramTypeStr ; + const char * dramTypeStr ; unsigned long ulTemp ; /* DumpDDIName("xgiXG2X_Setup()\n") ; */ |