[warning reduction 10/11] Eliminate gcc warning "initialization discards 'const' qualifier from pointer target type"

[Jeremy White <jwhite@xxxxxxxxxxxxxxx>]

---
 src/qxl_driver.c |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 360a245..f3515e4 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -67,6 +67,10 @@ extern void compat_init_scrn (ScrnInfoPtr);
 
 #define BREAKPOINT()   do { __asm__ __volatile__ ("int $03"); } while (0)
 
+static char filter_str[] = "filter";
+static char auto_str[]   = "auto";
+static char auto_glz_str[]   = "auto_glz";
+static char driver_name[] = QXL_DRIVER_NAME;
 const OptionInfoRec DefaultOptions[] =
 {
     { OPTION_ENABLE_IMAGE_CACHE,
@@ -98,15 +102,15 @@ const OptionInfoRec DefaultOptions[] =
     { OPTION_SPICE_X509_KEY_FILE,
       "SpiceX509KeyFile",         OPTV_STRING,    {0}, FALSE},
     { OPTION_SPICE_STREAMING_VIDEO,
-      "SpiceStreamingVideo",      OPTV_STRING,    {.str = "filter"}, FALSE},
+      "SpiceStreamingVideo",      OPTV_STRING,    {.str = filter_str}, FALSE},
     { OPTION_SPICE_PLAYBACK_COMPRESSION,
       "SpicePlaybackCompression", OPTV_BOOLEAN,   {1}, FALSE},
     { OPTION_SPICE_ZLIB_GLZ_WAN_COMPRESSION,
-      "SpiceZlibGlzWanCompression", OPTV_STRING,  {.str = "auto"}, FALSE},
+      "SpiceZlibGlzWanCompression", OPTV_STRING,  {.str = auto_str}, FALSE},
     { OPTION_SPICE_JPEG_WAN_COMPRESSION,
-      "SpiceJpegWanCompression",  OPTV_STRING,    {.str = "auto"}, FALSE},
+      "SpiceJpegWanCompression",  OPTV_STRING,    {.str = auto_str}, FALSE},
     { OPTION_SPICE_IMAGE_COMPRESSION,
-      "SpiceImageCompression",    OPTV_STRING,    {.str = "auto_glz"}, FALSE},
+      "SpiceImageCompression",    OPTV_STRING,    {.str = auto_glz_str}, FALSE},
     { OPTION_SPICE_DISABLE_COPY_PASTE,
       "SpiceDisableCopyPaste",    OPTV_BOOLEAN,   {0}, FALSE},
     { OPTION_SPICE_IPV4_ONLY,
@@ -2544,7 +2548,6 @@ qxl_identify (int flags)
 static void
 qxl_init_scrn (ScrnInfoPtr pScrn)
 {
-    static char driver_name[] = QXL_DRIVER_NAME;
     pScrn->driverVersion    = 0;
     pScrn->driverName       = driver_name;
     pScrn->name             = driver_name;
@@ -2571,7 +2574,7 @@ qxl_probe (struct _DriverRec *drv, int flags)
     pScrn = xf86AllocateScreen (drv, flags);
     qxl_init_scrn (pScrn);
     
-    xf86MatchDevice (QXL_DRIVER_NAME, &device);
+    xf86MatchDevice (driver_name, &device);
     entityIndex = xf86ClaimNoSlot (drv, 0, device[0], TRUE);
     pEnt = xf86GetEntityInfo (entityIndex);
     pEnt->driver = drv;
@@ -2663,7 +2666,7 @@ qxl_pci_probe (DriverPtr drv, int entity, struct pci_device *dev, intptr_t match
 
 static DriverRec qxl_driver = {
     0,
-    QXL_DRIVER_NAME,
+    driver_name,
     qxl_identify,
     qxl_probe,
     qxl_available_options,
@@ -2707,7 +2710,7 @@ qxl_setup (pointer module, pointer opts, int *errmaj, int *errmin)
 
 static XF86ModuleVersionInfo qxl_module_info =
 {
-    QXL_DRIVER_NAME,
+    driver_name,
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel