[PATCH 05/11] xkb: remove XkbAtomGetString, replace with NameForAtom.
Peter Hutterer
peter.hutterer at who-t.net
Thu Jan 14 21:32:13 PST 2010
XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
include/xkbsrv.h | 2 --
xkb/xkbfmisc.c | 10 +++++-----
xkb/xkbout.c | 2 +-
xkb/xkbtext.c | 4 ++--
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ed3779a..6b702e8 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -990,6 +990,4 @@ extern _X_EXPORT XkbDescPtr XkbCompileKeymap(
XkbRMLVOSet * /* rmlvo */
);
-#define XkbAtomGetString(s) NameForAtom(s)
-
#endif /* _XKBSRV_H_ */
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 52ef636..804ef20 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -240,7 +240,7 @@ unsigned wantNames,wantConfig,wantDflts;
if ((xkb!=NULL) && (old_names!=NULL)) {
if (wantNames&XkmTypesMask) {
if (old_names->types!=None) {
- tmp= XkbAtomGetString(old_names->types);
+ tmp= NameForAtom(old_names->types);
names->types= _XkbDupString(tmp);
}
else {
@@ -250,7 +250,7 @@ unsigned wantNames,wantConfig,wantDflts;
}
if (wantNames&XkmCompatMapMask) {
if (old_names->compat!=None) {
- tmp= XkbAtomGetString(old_names->compat);
+ tmp= NameForAtom(old_names->compat);
names->compat= _XkbDupString(tmp);
}
else wantDflts|= XkmCompatMapMask;
@@ -259,13 +259,13 @@ unsigned wantNames,wantConfig,wantDflts;
if (wantNames&XkmSymbolsMask) {
if (old_names->symbols==None)
return False;
- tmp= XkbAtomGetString(old_names->symbols);
+ tmp= NameForAtom(old_names->symbols);
names->symbols= _XkbDupString(tmp);
complete|= XkmSymbolsMask;
}
if (wantNames&XkmKeyNamesMask) {
if (old_names->keycodes!=None) {
- tmp= XkbAtomGetString(old_names->keycodes);
+ tmp= NameForAtom(old_names->keycodes);
names->keycodes= _XkbDupString(tmp);
}
else wantDflts|= XkmKeyNamesMask;
@@ -274,7 +274,7 @@ unsigned wantNames,wantConfig,wantDflts;
if (wantNames&XkmGeometryMask) {
if (old_names->geometry==None)
return False;
- tmp= XkbAtomGetString(old_names->geometry);
+ tmp= NameForAtom(old_names->geometry);
names->geometry= _XkbDupString(tmp);
complete|= XkmGeometryMask;
wantNames&= ~XkmGeometryMask;
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index b1c30d0..53f6841 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -233,7 +233,7 @@ WriteXKBIndicatorMap( FILE * file,
void * priv)
{
- fprintf(file," indicator \"%s\" {\n",XkbAtomGetString(name));
+ fprintf(file," indicator \"%s\" {\n",NameForAtom(name));
if (led->flags&XkbIM_NoExplicit)
fprintf(file," !allowExplicit;\n");
if (led->flags&XkbIM_LEDDrivesKB)
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 95ad013..324254d 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -74,7 +74,7 @@ XkbAtomText(Atom atm,unsigned format)
const char *atmstr;
char *rtrn,*tmp;
- atmstr = XkbAtomGetString(atm);
+ atmstr = NameForAtom(atm);
if (atmstr != NULL) {
int len;
len= strlen(atmstr)+1;
@@ -118,7 +118,7 @@ char numBuf[20];
if (ndx>=XkbNumVirtualMods)
tmp= "illegal";
else if (vmodNames&&(vmodNames[ndx]!=None))
- tmp= XkbAtomGetString(vmodNames[ndx]);
+ tmp= NameForAtom(vmodNames[ndx]);
if (tmp==NULL) {
sprintf(numBuf,"%d",ndx);
tmp = numBuf;
--
1.6.6
More information about the xorg-devel
mailing list