Add const attributes to fix gcc -Wwrite-strings warnings

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

15 files changed, 21 insertions, 21 deletions

diff --git a/include/X11/extensions/extutil.h b/include/X11/extensions/extutil.h
index 7f05aff..29404d5 100644
--- a/include/X11/extensions/extutil.h
+++ b/include/X11/extensions/extutil.h
@@ -123,7 +123,7 @@ extern void XextDestroyExtension(
 extern XExtDisplayInfo *XextAddDisplay(
     XExtensionInfo*	/* extinfo */,
     Display*		/* dpy */,
-    char*		/* ext_name */,
+    _Xconst char*	/* ext_name */,
     XExtensionHooks*	/* hooks */,
     int			/* nevents */,
     XPointer		/* data */
diff --git a/src/DPMS.c b/src/DPMS.c
index 07818a0..a4f0595 100644
--- a/src/DPMS.c
+++ b/src/DPMS.c
@@ -42,7 +42,7 @@ Equipment Corporation.
 
 static XExtensionInfo _dpms_info_data;
 static XExtensionInfo *dpms_info = &_dpms_info_data;
-static char *dpms_extension_name = DPMSExtensionName;
+static const char *dpms_extension_name = DPMSExtensionName;
 
 #define DPMSCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, dpms_extension_name, val)
diff --git a/src/MITMisc.c b/src/MITMisc.c
index bc452db..b8c21b6 100644
--- a/src/MITMisc.c
+++ b/src/MITMisc.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _mit_info_data;
 static XExtensionInfo *mit_info = &_mit_info_data;
-static /* const */ char *mit_extension_name = MITMISCNAME;
+static const char *mit_extension_name = MITMISCNAME;
 
 #define MITCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, mit_extension_name, val)
diff --git a/src/XAppgroup.c b/src/XAppgroup.c
index 16650b6..b5642f3 100644
--- a/src/XAppgroup.c
+++ b/src/XAppgroup.c
@@ -52,7 +52,7 @@ struct xagstuff {
 
 static XExtensionInfo _xag_info_data;
 static XExtensionInfo *xag_info = &_xag_info_data;
-static char *xag_extension_name = XAGNAME;
+static const char *xag_extension_name = XAGNAME;
 
 #define XagCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, xag_extension_name, val)
diff --git a/src/XEVI.c b/src/XEVI.c
index a30daac..eb09daa 100644
--- a/src/XEVI.c
+++ b/src/XEVI.c
@@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include <X11/Xutil.h>
 static XExtensionInfo *xevi_info;/* needs to move to globals.c */
-static /* const */ char *xevi_extension_name = EVINAME;
+static const char *xevi_extension_name = EVINAME;
 #define XeviCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, xevi_extension_name, val)
 /*****************************************************************************
diff --git a/src/XLbx.c b/src/XLbx.c
index b3ba1b2..fda00ea 100644
--- a/src/XLbx.c
+++ b/src/XLbx.c
@@ -33,7 +33,7 @@
 
 static XExtensionInfo _lbx_info_data;
 static XExtensionInfo *lbx_info = &_lbx_info_data;
-static /* const */ char *lbx_extension_name = LBXNAME;
+static const char *lbx_extension_name = LBXNAME;
 
 #define LbxCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, lbx_extension_name, val)
@@ -55,7 +55,7 @@ static /* const */ XExtensionHooks lbx_extension_hooks = {
     error_string,			/* error_string */
 };
 
-static /* const */ char *lbx_error_list[] = {
+static const char *lbx_error_list[] = {
     "BadLbxClient",			/* BadLbxClient */
 };
 
diff --git a/src/XMultibuf.c b/src/XMultibuf.c
index fb995f8..7a746ba 100644
--- a/src/XMultibuf.c
+++ b/src/XMultibuf.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _multibuf_info_data;
 static XExtensionInfo *multibuf_info = &_multibuf_info_data;
-static /* const */ char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME;
+static const char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME;
 
 #define MbufCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, multibuf_extension_name, val)
@@ -72,7 +72,7 @@ static /* const */ XExtensionHooks multibuf_extension_hooks = {
     error_string,			/* error_string */
 };
 
-static /* const */ char *multibuf_error_list[] = {
+static const char *multibuf_error_list[] = {
     "BadBuffer",			/* MultibufferBadBuffer */
 };
 
diff --git a/src/XSecurity.c b/src/XSecurity.c
index b2aa98c..f8c7da1 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _Security_info_data;
 static XExtensionInfo *Security_info = &_Security_info_data;
-static char *Security_extension_name = SECURITY_EXTENSION_NAME;
+static const char *Security_extension_name = SECURITY_EXTENSION_NAME;
 
 #define SecurityCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, Security_extension_name, val)
@@ -76,7 +76,7 @@ static XExtensionHooks Security_extension_hooks = {
     error_string                        /* error_string */
 };
 
-static char    *security_error_list[] = {
+static const char    *security_error_list[] = {
     "BadAuthorization",
     "BadAuthorizationProtocol"
 };
diff --git a/src/XShape.c b/src/XShape.c
index 1e3a77f..6e8fbae 100644
--- a/src/XShape.c
+++ b/src/XShape.c
@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _shape_info_data;
 static XExtensionInfo *shape_info = &_shape_info_data;
-static /* const */ char *shape_extension_name = SHAPENAME;
+static const char *shape_extension_name = SHAPENAME;
 
 #define ShapeCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, shape_extension_name, val)
diff --git a/src/XShm.c b/src/XShm.c
index e3f8fa0..f82455c 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _shm_info_data;
 static XExtensionInfo *shm_info = &_shm_info_data;
-static /* const */ char *shm_extension_name = SHMNAME;
+static const char *shm_extension_name = SHMNAME;
 
 #define ShmCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, shm_extension_name, val)
@@ -70,7 +70,7 @@ static /* const */ XExtensionHooks shm_extension_hooks = {
     error_string,			/* error_string */
 };
 
-static /* const */ char *shm_error_list[] = {
+static const char *shm_error_list[] = {
     "BadShmSeg",			/* BadShmSeg */
 };
 
diff --git a/src/XSync.c b/src/XSync.c
index 0e19922..df7c435 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -62,7 +62,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 static XExtensionInfo _sync_info_data;
 static XExtensionInfo *sync_info = &_sync_info_data;
-static char    *sync_extension_name = SYNC_NAME;
+static const char     *sync_extension_name = SYNC_NAME;
 
 #define SyncCheckExtension(dpy,i,val) \
 		XextCheckExtension(dpy, i, sync_extension_name, val)
@@ -89,7 +89,7 @@ static XExtensionHooks sync_extension_hooks = {
     error_string,		/* error_string */
 };
 
-static char    *sync_error_list[] = {
+static const char *sync_error_list[] = {
     "BadCounter",
     "BadAlarm",
     "BadFence",
diff --git a/src/Xcup.c b/src/Xcup.c
index ad78699..bb9e90f 100644
--- a/src/Xcup.c
+++ b/src/Xcup.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
 
 static XExtensionInfo _xcup_info_data;
 static XExtensionInfo *xcup_info = &_xcup_info_data;
-static char *xcup_extension_name = XCUPNAME;
+static const char *xcup_extension_name = XCUPNAME;
 
 /*****************************************************************************
  *                                                                           *
diff --git a/src/Xdbe.c b/src/Xdbe.c
index 1b9e2da..4b5fa18 100644
--- a/src/Xdbe.c
+++ b/src/Xdbe.c
@@ -42,7 +42,7 @@
 
 static XExtensionInfo _dbe_info_data;
 static XExtensionInfo *dbe_info = &_dbe_info_data;
-static char *dbe_extension_name = DBE_PROTOCOL_NAME;
+static const char *dbe_extension_name = DBE_PROTOCOL_NAME;
 
 #define DbeCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, dbe_extension_name, val)
@@ -86,7 +86,7 @@ static XExtensionHooks dbe_extension_hooks = {
     error_string,                       /* error_string */
 };
 
-static char *dbe_error_list[] = {
+static const char *dbe_error_list[] = {
     "BadBuffer",			/* DbeBadBuffer */
 };
 
diff --git a/src/Xge.c b/src/Xge.c
index d28a4f0..74e4802 100644
--- a/src/Xge.c
+++ b/src/Xge.c
@@ -76,7 +76,7 @@ static Bool _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info);
 
 /* main extension information data */
 static XExtensionInfo *xge_info;
-static char xge_extension_name[] = GE_NAME;
+static const char xge_extension_name[] = GE_NAME;
 static XExtensionHooks xge_extension_hooks = {
     NULL,	        /* create_gc */
     NULL,	        /* copy_gc */
diff --git a/src/extutil.c b/src/extutil.c
index 361a327..93cab73 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -96,7 +96,7 @@ void XextDestroyExtension (XExtensionInfo *info)
 XExtDisplayInfo *XextAddDisplay (
     XExtensionInfo *extinfo,
     Display *dpy,
-    char *ext_name,
+    _Xconst char *ext_name,
     XExtensionHooks *hooks,
     int nevents,
     XPointer data)