XKBgeom.h: Add _Xconst qualifier to char * arguments in functions

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

8 files changed, 24 insertions, 21 deletions

diff --git a/include/X11/extensions/XKBgeom.h b/include/X11/extensions/XKBgeom.h
index 3efbe790..3e1db7b9 100644
--- a/include/X11/extensions/XKBgeom.h
+++ b/include/X11/extensions/XKBgeom.h
@@ -279,21 +279,21 @@ _XFUNCPROTOBEGIN
 extern	XkbPropertyPtr
 XkbAddGeomProperty(
     XkbGeometryPtr	/* geom */,
-    char *		/* name */,
-    char *		/* value */
+    _Xconst char *	/* name */,
+    _Xconst char *	/* value */
 );
 
 extern	XkbKeyAliasPtr
 XkbAddGeomKeyAlias(
     XkbGeometryPtr	/* geom */,
-    char *		/* alias */,
-    char *		/* real */
+    _Xconst char *	/* alias */,
+    _Xconst char *	/* real */
 );
 
 extern	XkbColorPtr
 XkbAddGeomColor(
     XkbGeometryPtr	/* geom */,
-    char *		/* spec */,
+    _Xconst char *	/* spec */,
     unsigned int	/* pixel */
 );
 
@@ -348,8 +348,8 @@ extern XkbOverlayKeyPtr
 XkbAddGeomOverlayKey(
     XkbOverlayPtr	/* overlay */,
     XkbOverlayRowPtr	/* row */,
-    char *		/* over */,
-    char *		/* under */
+    _Xconst char *	/* over */,
+    _Xconst char *	/* under */
 );
 
 extern XkbDoodadPtr
@@ -597,7 +597,7 @@ extern	char *
 XkbFindOverlayForKey(
 	XkbGeometryPtr		/* geom */,
 	XkbSectionPtr		/* wanted */,
-	char *			/* under */
+	_Xconst char *		/* under */
 );
 
 extern	Status
diff --git a/man/xkb/XkbAddGeomColor.man b/man/xkb/XkbAddGeomColor.man
index 053c97e4..6ebe22c3 100644
--- a/man/xkb/XkbAddGeomColor.man
+++ b/man/xkb/XkbAddGeomColor.man
@@ -27,7 +27,7 @@ description
 .HP
 .B XkbColorPtr XkbAddGeomColor
 .BI "(\^XkbGeometryPtr " "geom" "\^,"
-.BI "char *" "spec" "\^,"
+.BI "_Xconst char *" "spec" "\^,"
 .BI "unsigned int " "pixel" "\^);"
 .if n .ti +5n
 .if t .ti +.5i
diff --git a/man/xkb/XkbAddGeomKeyAlias.man b/man/xkb/XkbAddGeomKeyAlias.man
index 02510707..63f8924b 100644
--- a/man/xkb/XkbAddGeomKeyAlias.man
+++ b/man/xkb/XkbAddGeomKeyAlias.man
@@ -27,8 +27,8 @@ description
 .HP
 .B XkbKeyAliasPtr XkbAddGeomKeyAlias
 .BI "(\^XkbGeometryPtr " "geom" "\^,"
-.BI "char *" "alias" "\^,"
-.BI "char *" "real" "\^);"
+.BI "_Xconst char *" "alias" "\^,"
+.BI "_Xconst char *" "real" "\^);"
 .if n .ti +5n
 .if t .ti +.5i
 .SH ARGUMENTS
diff --git a/man/xkb/XkbAddGeomOverlayKey.man b/man/xkb/XkbAddGeomOverlayKey.man
index 97423602..bce3d266 100644
--- a/man/xkb/XkbAddGeomOverlayKey.man
+++ b/man/xkb/XkbAddGeomOverlayKey.man
@@ -27,7 +27,8 @@ XkbAddGeomOverlayKey \- Add a key to an existing overlay row
 .B XkbOverlayKeyPtr XkbAddGeomOverlayKey
 .BI "(\^XkbOverlayPtr " "overlay" "\^,"
 .BI "XkbRowPtr " "row" "\^,"
-.BI "char *" "under" "\^);"
+.BI "_Xconst char *" "over" "\^,"
+.BI "_Xconst char *" "under" "\^);"
 .if n .ti +5n
 .if t .ti +.5i
 .SH ARGUMENTS
diff --git a/man/xkb/XkbAddGeomProperty.man b/man/xkb/XkbAddGeomProperty.man
index 0d2f3b92..1ec546cd 100644
--- a/man/xkb/XkbAddGeomProperty.man
+++ b/man/xkb/XkbAddGeomProperty.man
@@ -27,8 +27,8 @@ description
 .HP
 .B XkbPropertyPtr XkbAddGeomProperty
 .BI "(\^XkbGeometryPtr " "geom" "\^,"
-.BI "char *" "name" "\^,"
-.BI "char *" "value" "\^);"
+.BI "_Xconst char *" "name" "\^,"
+.BI "_Xconst char *" "value" "\^);"
 .if n .ti +5n
 .if t .ti +.5i
 .SH ARGUMENTS
diff --git a/man/xkb/XkbFindOverlayForKey.man b/man/xkb/XkbFindOverlayForKey.man
index 4036e105..e80cb838 100644
--- a/man/xkb/XkbFindOverlayForKey.man
+++ b/man/xkb/XkbFindOverlayForKey.man
@@ -28,7 +28,7 @@ key that is part of an overlay
 .B char * XkbFindOverlayForKey
 .BI "(\^XkbGeometryPtr " "geom" "\^,"
 .BI "XkbSectionPtr " "section" "\^,"
-.BI "char *" "under" "\^);"
+.BI "_Xconst char *" "under" "\^);"
 .if n .ti +5n
 .if t .ti +.5i
 .SH ARGUMENTS
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 3a257c04..5b02f34c 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/XKBGAlloc.c
@@ -650,7 +650,7 @@ XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes)
 /***====================================================================***/
 
 XkbPropertyPtr
-XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
+XkbAddGeomProperty(XkbGeometryPtr geom, _Xconst char *name, _Xconst char *value)
 {
     register int i;
     register XkbPropertyPtr prop;
@@ -683,7 +683,8 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
 }
 
 XkbKeyAliasPtr
-XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
+XkbAddGeomKeyAlias(XkbGeometryPtr geom, _Xconst char *aliasStr,
+                   _Xconst char *realStr)
 {
     register int i;
     register XkbKeyAliasPtr alias;
@@ -711,7 +712,7 @@ XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr)
 }
 
 XkbColorPtr
-XkbAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel)
+XkbAddGeomColor(XkbGeometryPtr geom, _Xconst char *spec, unsigned int pixel)
 {
     register int i;
     register XkbColorPtr color;
@@ -898,8 +899,8 @@ XkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name)
 XkbOverlayKeyPtr
 XkbAddGeomOverlayKey(XkbOverlayPtr overlay,
                      XkbOverlayRowPtr row,
-                     char *over,
-                     char *under)
+                     _Xconst char *over,
+                     _Xconst char *under)
 {
     register int i;
     XkbOverlayKeyPtr key;
diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index be7537b9..ab3bbc7c 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -208,7 +208,8 @@ XkbComputeSectionBounds(XkbGeometryPtr geom, XkbSectionPtr section)
 /***====================================================================***/
 
 char *
-XkbFindOverlayForKey(XkbGeometryPtr geom, XkbSectionPtr wanted, char *under)
+XkbFindOverlayForKey(XkbGeometryPtr geom, XkbSectionPtr wanted,
+                     _Xconst char *under)
 {
     int s;
     XkbSectionPtr section;