frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark XKB char * as const to clean up gcc -Wwrite-strings warnings 

Cleans up around 120 warnings from this set

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-11-03 21:18:56 -07:00
parent cccafabd56
commit f8dd5efb67
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xkbfile.h
View File

@ -136,7 +136,7 @@ extern _X_EXPORT char * XkbConfigText(
unsigned /* format */ unsigned /* format */
); );
extern _X_EXPORT char * XkbSIMatchText( extern _X_EXPORT const char * XkbSIMatchText(
unsigned /* type */, unsigned /* type */,
unsigned /* format */ unsigned /* format */
); );
@ -161,7 +161,7 @@ extern _X_EXPORT char * XkbDoodadTypeText(
unsigned /* format */ unsigned /* format */
); );
extern _X_EXPORT char * XkbActionTypeText( extern _X_EXPORT const char * XkbActionTypeText(
unsigned /* type */, unsigned /* type */,
unsigned /* format */ unsigned /* format */
); );

4
include/xkbsrv.h
View File

@ -296,8 +296,8 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
extern _X_EXPORT int XkbReqCode; extern _X_EXPORT int XkbReqCode;
extern _X_EXPORT int XkbEventBase; extern _X_EXPORT int XkbEventBase;
extern _X_EXPORT int XkbKeyboardErrorCode; extern _X_EXPORT int XkbKeyboardErrorCode;
extern _X_EXPORT char * XkbBaseDirectory; extern _X_EXPORT const char * XkbBaseDirectory;
extern _X_EXPORT char * XkbBinDirectory; extern _X_EXPORT const char * XkbBinDirectory;
extern _X_EXPORT CARD32 xkbDebugFlags; extern _X_EXPORT CARD32 xkbDebugFlags;

2
xkb/ddxList.c
View File

@ -60,7 +60,7 @@ extern int Win32System(const char *cmdline);
/***====================================================================***/ /***====================================================================***/
static char *componentDirs[_XkbListNumComponents] = { static const char *componentDirs[_XkbListNumComponents] = {
"keycodes", "types", "compat", "symbols", "geometry" "keycodes", "types", "compat", "symbols", "geometry"
}; };

2
xkb/maprules.c
View File

@ -200,7 +200,7 @@ Bool endOfFile,spacePending,slashPending,inComment;
#define PART_MASK 0x000F #define PART_MASK 0x000F
#define COMPONENT_MASK 0x03F0 #define COMPONENT_MASK 0x03F0
static char * cname[MAX_WORDS] = { static const char * cname[MAX_WORDS] = {
"model", "layout", "variant", "option", "model", "layout", "variant", "option",
"keycodes", "symbols", "types", "compat", "geometry" "keycodes", "symbols", "types", "compat", "geometry"
}; };

4
xkb/xkbInit.c
View File

@ -88,8 +88,8 @@ typedef struct _SrvXkmInfo {
#define XKB_DFLT_RULES_PROP TRUE #define XKB_DFLT_RULES_PROP TRUE
#endif #endif
char * XkbBaseDirectory= XKB_BASE_DIRECTORY; const char * XkbBaseDirectory= XKB_BASE_DIRECTORY;
char * XkbBinDirectory= XKB_BIN_DIRECTORY; const char * XkbBinDirectory= XKB_BIN_DIRECTORY;
static int XkbWantAccessX= 0; static int XkbWantAccessX= 0;
static char * XkbRulesDflt= NULL; static char * XkbRulesDflt= NULL;

2
xkb/xkbfmisc.c
View File

@ -146,7 +146,7 @@ unsigned set,rtrn;
/***===================================================================***/ /***===================================================================***/
static Bool static Bool
XkbWriteSectionFromName(FILE *file,char *sectionName,char *name) XkbWriteSectionFromName(FILE *file,const char *sectionName,const char *name)
{ {
fprintf(file," xkb_%-20s { include \"%s\" };\n",sectionName,name); fprintf(file," xkb_%-20s { include \"%s\" };\n",sectionName,name);
return TRUE; return TRUE;

6
xkb/xkbout.c
View File

@ -108,7 +108,7 @@ XkbWriteXKBKeycodes( FILE * file,
{ {
Atom kcName; Atom kcName;
register unsigned i; register unsigned i;
char * alternate; const char * alternate;
if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) { if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
_XkbLibError(_XkbErrMissingNames,"XkbWriteXKBKeycodes",0); _XkbLibError(_XkbErrMissingNames,"XkbWriteXKBKeycodes",0);
@ -133,7 +133,7 @@ char * alternate;
} }
if (xkb->indicators!=NULL) { if (xkb->indicators!=NULL) {
for (i=0;i<XkbNumIndicators;i++) { for (i=0;i<XkbNumIndicators;i++) {
char *type; const char *type;
if (xkb->indicators->phys_indicators&(1<<i)) if (xkb->indicators->phys_indicators&(1<<i))
type= " "; type= " ";
else type= " virtual "; else type= " virtual ";
@ -395,7 +395,7 @@ Bool showActions;
(showImplicit)) { (showImplicit)) {
int typeNdx,g; int typeNdx,g;
Bool multi; Bool multi;
char * comment=" "; const char * comment=" ";
if ((srv->explicit[i]&XkbExplicitKeyTypesMask)==0) if ((srv->explicit[i]&XkbExplicitKeyTypesMask)==0)
comment= "//"; comment= "//";

20
xkb/xkbtext.c
View File

@ -215,7 +215,7 @@ char *str,buf[BUFFER_SIZE];
return rtrn; return rtrn;
} }
static char *modNames[XkbNumModifiers] = { static const char *modNames[XkbNumModifiers] = {
"Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5" "Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5"
}; };
@ -367,15 +367,15 @@ char *buf;
/***====================================================================***/ /***====================================================================***/
static char *siMatchText[5] = { static const char *siMatchText[5] = {
"NoneOf", "AnyOfOrNone", "AnyOf", "AllOf", "Exactly" "NoneOf", "AnyOfOrNone", "AnyOf", "AllOf", "Exactly"
}; };
char * const char *
XkbSIMatchText(unsigned type,unsigned format) XkbSIMatchText(unsigned type,unsigned format)
{ {
static char buf[40]; static char buf[40];
char *rtrn; const char *rtrn;
switch (type&XkbSI_OpMask) { switch (type&XkbSI_OpMask) {
case XkbSI_NoneOf: rtrn= siMatchText[0]; break; case XkbSI_NoneOf: rtrn= siMatchText[0]; break;
@ -397,7 +397,7 @@ char *rtrn;
/***====================================================================***/ /***====================================================================***/
static char *imWhichNames[]= { static const char *imWhichNames[]= {
"base", "base",
"latched", "latched",
"locked", "locked",
@ -448,7 +448,7 @@ char * buf;
return buf; return buf;
} }
static char *ctrlNames[] = { static const char *ctrlNames[] = {
"repeatKeys", "repeatKeys",
"slowKeys", "slowKeys",
"bounceKeys", "bounceKeys",
@ -616,7 +616,7 @@ char * buf;
return buf; return buf;
} }
static char *actionTypeNames[XkbSA_NumActions]= { static const char *actionTypeNames[XkbSA_NumActions]= {
"NoAction", "NoAction",
"SetMods", "LatchMods", "LockMods", "SetMods", "LatchMods", "LockMods",
"SetGroup", "LatchGroup", "LockGroup", "SetGroup", "LatchGroup", "LockGroup",
@ -631,11 +631,11 @@ static char *actionTypeNames[XkbSA_NumActions]= {
"DeviceBtn", "LockDeviceBtn" "DeviceBtn", "LockDeviceBtn"
}; };
char * const char *
XkbActionTypeText(unsigned type,unsigned format) XkbActionTypeText(unsigned type,unsigned format)
{ {
static char buf[32]; static char buf[32];
char *rtrn; const char *rtrn;
if (type<=XkbSA_LastAction) { if (type<=XkbSA_LastAction) {
rtrn= actionTypeNames[type]; rtrn= actionTypeNames[type];
@ -652,7 +652,7 @@ char *rtrn;
/***====================================================================***/ /***====================================================================***/
static int static int
TryCopyStr(char *to,char *from,int *pLeft) TryCopyStr(char *to,const char *from,int *pLeft)
{ {
register int len; register int len;
if (*pLeft>0) { if (*pLeft>0) {