Resolve 174 out of 180 -Wdiscarded-qualifiers warnings

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

5 files changed, 22 insertions, 22 deletions

diff --git a/src/initextx.c b/src/initextx.c
index d6cd049..7286b16 100644
--- a/src/initextx.c
+++ b/src/initextx.c
@@ -194,6 +194,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
    int		  i, j, k, l, index, vclkindex, UseWide;
    DisplayModePtr new = NULL, current = NULL, first = NULL;
    BOOLEAN	  done = FALSE, IsHDCLK;
+   char *	  name_string;
 #if 0
    DisplayModePtr backup = NULL;
 #endif
@@ -240,7 +241,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 
       if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
       memset(new, 0, sizeof(DisplayModeRec));
-      if(!(new->name = malloc(10))) {
+      if(!(new->name = name_string = malloc(10))) {
 	 free(new);
 	 return first;
       }
@@ -252,7 +253,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 
       current = new;
 
-      sprintf(current->name, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
+      sprintf(name_string, "%hu%hu", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
 				      pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
 
       current->status = MODE_OK;
@@ -388,7 +389,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
 
 		  memset(new, 0, sizeof(DisplayModeRec));
-		  if(!(new->name = malloc(12))) {
+		  if(!(new->name = name_string = malloc(12))) {
 		     free(new);
 		     return first;
 		  }
@@ -402,7 +403,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 
 		  pSiS->AddedPlasmaModes = TRUE;
 
-		  strcpy(current->name, SiS_PlasmaMode[l].name);
+		  strcpy(name_string, SiS_PlasmaMode[l].name);
 
 		  current->status = MODE_OK;
 
@@ -473,7 +474,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
 
 	    memset(new, 0, sizeof(DisplayModeRec));
-	    if(!(new->name = malloc(10))) {
+	    if(!(new->name = name_string = malloc(10))) {
 	       free(new);
 	       return first;
 	    }
@@ -485,7 +486,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
 
 	    current = new;
 
-	    sprintf(current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i],
+	    sprintf(name_string, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i],
 				pSiS->SiS_Pr->CP_VDisplay[i]);
 
 	    current->status = MODE_OK;
diff --git a/src/sis.h b/src/sis.h
index 9b01449..1b42dd3 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -1483,30 +1483,30 @@ typedef struct _pdctable {
     int  subsysVendor;
     int  subsysCard;
     int  pdc;
-    char *vendorName;
-    char *cardName;
+    const char *vendorName;
+    const char *cardName;
 } pdctable;
 
 typedef struct _chswtable {
     int  subsysVendor;
     int  subsysCard;
-    char *vendorName;
-    char *cardName;
+    const char *vendorName;
+    const char *cardName;
 } chswtable;
 
 typedef struct _customttable {
     UShort chipID;
-    char   *biosversion;
-    char   *biosdate;
+    const char   *biosversion;
+    const char   *biosdate;
     CARD32 bioschksum;
     UShort biosFootprintAddr[5];
     UChar  biosFootprintData[5];
     UShort pcisubsysvendor;
     UShort pcisubsyscard;
-    char   *vendorName;
-    char   *cardName;
+    const char   *vendorName;
+    const char   *cardName;
     ULong  SpecialID;
-    char   *optionName;
+    const char   *optionName;
 } customttable;
 
 #ifdef SISMERGED
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 09e275a..6decae8 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -2762,7 +2762,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
 {
     DisplayModePtr p;
     float hsync, refresh = 0.0;
-    char *desc, *desc2, *prefix, *uprefix, *output;
+    const char *desc, *desc2, *prefix, *uprefix, *output;
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
 	       "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
@@ -6087,11 +6087,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 	  while(tempm) {
 	     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(!pSiS->CRT2pScrn->monitor->Modes) pSiS->CRT2pScrn->monitor->Modes = newm;
 	     if(currentm) {
 	        currentm->next = newm;
diff --git a/src/sis_memcpy.c b/src/sis_memcpy.c
index d144a02..c90c961 100644
--- a/src/sis_memcpy.c
+++ b/src/sis_memcpy.c
@@ -342,7 +342,7 @@ extern void	    SISFreeFBMemory(ScrnInfoPtr pScrn, void **handle);
 
 typedef struct {
     vidCopyFunc  mFunc;
-    char         *mName;
+    const char  *mName;
     unsigned int mycpuflag;
     int          grade;
     int 	 gradefrom;
diff --git a/src/sis_setup.c b/src/sis_setup.c
index bb8c6cd..6b95c19 100644
--- a/src/sis_setup.c
+++ b/src/sis_setup.c
@@ -480,7 +480,7 @@ sis315Setup(ScrnInfoPtr pScrn)
     int     busDDR[4]  = {32, 32,  64,  64};
     int     busDDRA[4] = {64+32, 64+32 , (64+32)*2, (64+32)*2};
     unsigned int config, config1, config2, sr3a, cr5f;
-    char    *dramTypeStr315[] = {
+    const char    *dramTypeStr315[] = {
 	"Single channel 1 rank SDR SDRAM",
 	"Single channel 1 rank SDR SGRAM",
 	"Single channel 1 rank DDR SDRAM",
@@ -498,7 +498,7 @@ sis315Setup(ScrnInfoPtr pScrn)
 	"Dual channel DDR SDRAM",
 	"Dual channel DDR SGRAM"
     };
-    char    *dramTypeStr330[] = {
+    const char    *dramTypeStr330[] = {
 	"Single Channel SDR SDRAM",
 	"",
 	"Single Channel DDR SDRAM",
@@ -516,7 +516,7 @@ sis315Setup(ScrnInfoPtr pScrn)
 	"Dual channel DDR SDRAM",
 	""
     };
-    char    *dramTypeStr340[] = {
+    const char    *dramTypeStr340[] = {
 	"Single channel DDR SDRAM",
 	"Single channel DDR2 SDRAM",
 	"Single channel DDR2x SDRAM",