diff options
Diffstat (limited to 'xkb/xkbtext.c')
| -rw-r--r-- | xkb/xkbtext.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 18c07a18a..d233af0b4 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -24,12 +24,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ #include <stdio.h> #include <ctype.h> -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#endif #include <X11/Xos.h> @@ -403,7 +402,7 @@ static char buf[32],*rtrn; if (sym==NoSymbol) strcpy(rtrn=buf,"NoSymbol"); else if ((rtrn=XKeysymToString(sym))==NULL) - sprintf(rtrn=buf,"0x%x",sym); + sprintf(rtrn=buf, "0x%lx", (long)sym); else if (format==XkbCFile) { sprintf(buf,"XK_%s",rtrn); rtrn= buf; @@ -412,7 +411,7 @@ static char buf[32],*rtrn; #else /* def XKB_IN_SERVER */ if (sym==NoSymbol) strcpy(rtrn=buf,"NoSymbol"); - else sprintf(rtrn=buf,"0x%x",sym); + else sprintf(rtrn=buf, "0x%lx", (long)sym); return rtrn; #endif /* XKB_IN_SERVER */ } @@ -589,7 +588,7 @@ int len,plen,slen; if ((detail&XkbAllNewKeyboardEventsMask)==0) { - char * tmp; + char *tmp = ""; if (format==XkbCFile) tmp= "0"; else if (format==XkbMessage) tmp= "none"; buf= tbGetBuffer(strlen(tmp)+1); @@ -874,7 +873,7 @@ char *rtrn; } return rtrn; } - sprintf(buf,"0x%x",type); + sprintf(buf,"Private"); return buf; } @@ -1500,7 +1499,7 @@ int sz; if (format==XkbCFile) { sprintf(buf, - "{ %20s, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x }", + "{ %20s, { 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x } }", XkbActionTypeText(action->type,XkbCFile), action->any.data[0],action->any.data[1],action->any.data[2], action->any.data[3],action->any.data[4],action->any.data[5], @@ -1543,7 +1542,7 @@ char buf[256],*tmp; permanent=((behavior->type&XkbKB_Permanent)!=0); if (type==XkbKB_Lock) { - sprintf(buf,"lock= %s,",(permanent?"Permanent":"True")); + sprintf(buf,"lock= %s",(permanent?"Permanent":"True")); } else if (type==XkbKB_RadioGroup) { int g; |