summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--action.c4
-rw-r--r--alias.c2
-rw-r--r--compat.c6
-rw-r--r--expr.c10
-rw-r--r--geometry.c6
-rw-r--r--indicators.c6
-rw-r--r--keycodes.c8
-rw-r--r--keymap.c2
-rw-r--r--keytypes.c18
-rw-r--r--listing.c2
-rw-r--r--misc.c6
-rw-r--r--symbols.c32
-rw-r--r--utils.c2
-rw-r--r--vmod.c16
-rw-r--r--xkbcomp.c2
-rw-r--r--xkbpath.c4
16 files changed, 63 insertions, 63 deletions
diff --git a/action.c b/action.c
index a984bc7..fc675c9 100644
--- a/action.c
+++ b/action.c
@@ -372,7 +372,7 @@ CheckModifierField(XkbDescPtr xkb,
if (value->op == ExprIdent)
{
- register char *valStr;
+ char *valStr;
valStr = XkbAtomGetString(NULL, value->value.str);
if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) ||
(uStrCaseCmp(valStr, "modmapmods") == 0)))
@@ -1324,7 +1324,7 @@ HandleActionDef(ExprDef * def,
XkbAnyAction * action, unsigned mergeMode, ActionInfo * info)
{
ExprDef *arg;
- register char *str;
+ char *str;
unsigned tmp, hndlrType;
if (!actionsInitialized)
diff --git a/alias.c b/alias.c
index b9d44ef..8532d1b 100644
--- a/alias.c
+++ b/alias.c
@@ -158,7 +158,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge)
int
ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{
- register int i;
+ int i;
XkbKeyAliasPtr old, a;
AliasInfo *info;
int nNew, nOld;
diff --git a/compat.c b/compat.c
index 757ef42..92bd3c1 100644
--- a/compat.c
+++ b/compat.c
@@ -102,7 +102,7 @@ siText(SymInterpInfo * si, CompatInfo * info)
static void
InitCompatInfo(CompatInfo * info, XkbDescPtr xkb)
{
- register int i;
+ int i;
info->xkb = xkb;
info->name = NULL;
@@ -135,7 +135,7 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb)
static void
ClearCompatInfo(CompatInfo * info, XkbDescPtr xkb)
{
- register int i;
+ int i;
if (info->name != NULL)
uFree(info->name);
@@ -352,7 +352,7 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge)
SymInterpInfo *si;
LEDInfo *led, *rtrn, *next;
GroupCompatInfo *gcm;
- register int i;
+ int i;
if (from->errorCount > 0)
{
diff --git a/expr.c b/expr.c
index 12cff10..b5e7222 100644
--- a/expr.c
+++ b/expr.c
@@ -158,7 +158,7 @@ SimpleLookup(XPointer priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
LookupEntry *entry;
- register char *str;
+ char *str;
if ((priv == NULL) ||
(field == None) || (elem != None) ||
@@ -185,7 +185,7 @@ Bool
RadioLookup(XPointer priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
- register char *str;
+ char *str;
int rg;
if ((field == None) || (elem != None) || (type != TypeInt))
@@ -214,7 +214,7 @@ TableLookup(XPointer priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
LookupTable *tbl = (LookupTable *) priv;
- register char *str;
+ char *str;
if ((priv == NULL) || (field == None) || (type != TypeInt))
return False;
@@ -487,7 +487,7 @@ ExprResolveFloat(ExprDef * expr,
case ExprValue:
if (expr->type == TypeString)
{
- register char *str;
+ char *str;
str = XkbAtomGetString(NULL, expr->value.str);
if ((str != NULL) && (strlen(str) == 1))
{
@@ -600,7 +600,7 @@ ExprResolveInteger(ExprDef * expr,
case ExprValue:
if (expr->type == TypeString)
{
- register char *str;
+ char *str;
str = XkbAtomGetString(NULL, expr->value.str);
if (str != NULL)
switch (strlen(str))
diff --git a/geometry.c b/geometry.c
index a5bf70c..089ebed 100644
--- a/geometry.c
+++ b/geometry.c
@@ -637,7 +637,7 @@ FreeShapes(ShapeInfo * si, GeometryInfo * info)
{
if (tmp->outlines)
{
- register int i;
+ int i;
for (i = 0; i < tmp->nOutlines; i++)
{
if (tmp->outlines[i].points != NULL)
@@ -2923,7 +2923,7 @@ HandleGeometryFile(XkbFile * file,
static Bool
CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
{
- register int i, n;
+ int i, n;
XkbShapePtr shape;
XkbOutlinePtr old_outline, outline;
Atom name;
@@ -3405,7 +3405,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
OverlayInfo * oi,
GeometryInfo * info, short rowMap[256], short rowSize[256])
{
- register OverlayKeyInfo *ki, *next;
+ OverlayKeyInfo *ki, *next;
unsigned long oKey, uKey, sKey;
XkbRowPtr row;
XkbKeyPtr key;
diff --git a/indicators.c b/indicators.c
index b3e7d18..3ed0bee 100644
--- a/indicators.c
+++ b/indicators.c
@@ -418,7 +418,7 @@ CopyIndicatorMapDefs(XkbFileInfo * result, LEDInfo * leds,
}
else
{
- register XkbIndicatorMapPtr im;
+ XkbIndicatorMapPtr im;
im = &xkb->indicators->maps[led->indicator - 1];
im->flags = led->flags;
im->which_groups = led->which_groups;
@@ -445,8 +445,8 @@ BindIndicators(XkbFileInfo * result,
Bool force, LEDInfo * unbound, LEDInfo ** unboundRtrn)
{
XkbDescPtr xkb;
- register int i;
- register LEDInfo *led, *next, *last;
+ int i;
+ LEDInfo *led, *next, *last;
xkb = result->xkb;
if (xkb->names != NULL)
diff --git a/keycodes.c b/keycodes.c
index 4a8973c..d4b9b5c 100644
--- a/keycodes.c
+++ b/keycodes.c
@@ -307,7 +307,7 @@ InitKeyNamesInfo(KeyNamesInfo * info)
static int
FindKeyByLong(KeyNamesInfo * info, unsigned long name)
{
- register int i;
+ int i;
for (i = info->effectiveMin; i <= info->effectiveMax; i++)
{
@@ -435,7 +435,7 @@ static void
MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from,
unsigned merge)
{
- register int i;
+ int i;
char buf[5];
if (from->errorCount > 0)
@@ -860,7 +860,7 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, unsigned merge)
if (XkbAllocNames(xkb, XkbKeyNamesMask | XkbIndicatorNamesMask, 0, 0)
== Success)
{
- register int i;
+ int i;
xkb->names->keycodes = XkbInternAtom(xkb->dpy, info.name, False);
uDEBUG2(1, "key range: %d..%d\n", xkb->min_key_code,
xkb->max_key_code);
@@ -892,7 +892,7 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, unsigned merge)
XkbAtomGetString(NULL, ii->name), False);
if (xkb->indicators != NULL)
{
- register unsigned bit;
+ unsigned bit;
bit = 1 << (ii->ndx - 1);
if (ii->virtual)
xkb->indicators->phys_indicators &= ~bit;
diff --git a/keymap.c b/keymap.c
index b373f43..06d1809 100644
--- a/keymap.c
+++ b/keymap.c
@@ -161,7 +161,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
result->defined = have;
if (required & (~have))
{
- register int i, bit;
+ int i, bit;
unsigned missing;
missing = required & (~have);
for (i = 0, bit = 1; missing != 0; i++, bit <<= 1)
diff --git a/keytypes.c b/keytypes.c
index 121280f..0735e11 100644
--- a/keytypes.c
+++ b/keytypes.c
@@ -172,7 +172,7 @@ InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, KeyTypesInfo * from)
info->dflt.lvlNames = uTypedCalloc(from->dflt.szNames, Atom);
if (info->dflt.lvlNames)
{
- register unsigned sz = from->dflt.szNames * sizeof(Atom);
+ unsigned sz = from->dflt.szNames * sizeof(Atom);
memcpy(info->dflt.lvlNames, from->dflt.lvlNames, sz);
}
}
@@ -229,7 +229,7 @@ FreeKeyTypesInfo(KeyTypesInfo * info)
info->name = NULL;
if (info->types)
{
- register KeyTypeInfo *type;
+ KeyTypeInfo *type;
for (type = info->types; type; type = (KeyTypeInfo *) type->defs.next)
{
FreeKeyTypeInfo(type);
@@ -478,7 +478,7 @@ HandleIncludeKeyTypes(IncludeStmt * stmt,
static XkbKTMapEntryPtr
FindMatchingMapEntry(KeyTypeInfo * type, unsigned mask, unsigned vmask)
{
- register int i;
+ int i;
XkbKTMapEntryPtr entry;
for (i = 0, entry = type->entries; i < type->nEntries; i++, entry++)
@@ -492,7 +492,7 @@ FindMatchingMapEntry(KeyTypeInfo * type, unsigned mask, unsigned vmask)
static void
DeleteLevel1MapEntries(KeyTypeInfo * type)
{
- register int i, n;
+ int i, n;
for (i = 0; i < type->nEntries; i++)
{
@@ -992,7 +992,7 @@ static int
HandleKeyTypeDef(KeyTypeDef * def,
XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info)
{
- register int i;
+ int i;
KeyTypeInfo type;
if (def->merge != MergeDefault)
@@ -1134,7 +1134,7 @@ HandleKeyTypesFile(XkbFile * file,
static Bool
CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
{
- register int i;
+ int i;
PreserveInfo *pre;
for (pre = def->preserve; pre != NULL;
@@ -1217,9 +1217,9 @@ CompileKeyTypes(XkbFile * file, XkbFileInfo * result, unsigned merge)
if (info.errorCount == 0)
{
- register int i;
- register KeyTypeInfo *def;
- register XkbKeyTypePtr type, next;
+ int i;
+ KeyTypeInfo *def;
+ XkbKeyTypePtr type, next;
if (info.name != NULL)
{
diff --git a/listing.c b/listing.c
index dc1cee9..4c8fe70 100644
--- a/listing.c
+++ b/listing.c
@@ -197,7 +197,7 @@ AddListing(char *file, char *map)
static void
ListFile(FILE * outFile, char *fileName, XkbFile * map)
{
- register unsigned flags;
+ unsigned flags;
char *mapName;
flags = map->flags;
diff --git a/misc.c b/misc.c
index 5faa6c1..498ec71 100644
--- a/misc.c
+++ b/misc.c
@@ -401,7 +401,7 @@ Status
ComputeKbdDefaults(XkbDescPtr xkb)
{
Status rtrn;
- register int i, tmp, nUnknown;
+ int i, tmp, nUnknown;
KeyNameDesc *name;
KeySym *syms;
char tmpname[XkbKeyNameLength + 1];
@@ -494,7 +494,7 @@ FindNamedKey(XkbDescPtr xkb,
unsigned int *kc_rtrn,
Bool use_aliases, Bool create, int start_from)
{
- register unsigned n;
+ unsigned n;
if (start_from < xkb->min_key_code)
{
@@ -565,7 +565,7 @@ Bool
FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname,
unsigned long *real_name)
{
- register int i;
+ int i;
char name[XkbKeyNameLength + 1];
if (xkb && xkb->geom && xkb->geom->key_aliases)
diff --git a/symbols.c b/symbols.c
index 06e5095..1b59475 100644
--- a/symbols.c
+++ b/symbols.c
@@ -81,7 +81,7 @@ typedef struct _KeyInfo
static void
InitKeyInfo(KeyInfo * info)
{
- register int i;
+ int i;
static char dflt[4] = "*";
info->defs.defined = 0;
@@ -114,7 +114,7 @@ InitKeyInfo(KeyInfo * info)
static void
FreeKeyInfo(KeyInfo * info)
{
- register int i;
+ int i;
info->defs.defined = 0;
info->defs.fileID = 0;
@@ -151,7 +151,7 @@ FreeKeyInfo(KeyInfo * info)
static Bool
CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOld)
{
- register int i;
+ int i;
*new = *old;
new->defs.next = NULL;
@@ -237,7 +237,7 @@ typedef struct _SymbolsInfo
static void
InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb)
{
- register int i;
+ int i;
tok_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False);
tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False);
@@ -264,7 +264,7 @@ InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb)
static void
FreeSymbolsInfo(SymbolsInfo * info)
{
- register int i;
+ int i;
if (info->name)
uFree(info->name);
@@ -333,7 +333,7 @@ MergeKeyGroups(SymbolsInfo * info,
KeySym *resultSyms;
XkbAction *resultActs;
int resultWidth;
- register int i;
+ int i;
Bool report, clobber;
clobber = (from->defs.merge != MergeAugment);
@@ -477,7 +477,7 @@ MergeKeyGroups(SymbolsInfo * info,
static Bool
MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from)
{
- register int i;
+ int i;
unsigned collide = 0;
Bool report;
@@ -601,7 +601,7 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from)
static Bool
AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb)
{
- register int i;
+ int i;
unsigned long real_name;
for (i = 0; i < info->nKeys; i++)
@@ -713,7 +713,7 @@ static void
MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
unsigned merge, XkbDescPtr xkb)
{
- register int i;
+ int i;
KeyInfo *key;
if (from->errorCount > 0)
@@ -887,7 +887,7 @@ GetGroupIndex(KeyInfo * key,
if (arrayNdx == NULL)
{
- register int i;
+ int i;
unsigned defined;
if (what == SYMBOLS)
defined = key->symsDefined;
@@ -990,7 +990,7 @@ AddActionsToKey(KeyInfo * key,
const char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
- register int i;
+ int i;
unsigned ndx, nActs;
ExprDef *act;
XkbAnyAction *toAct;
@@ -1706,8 +1706,8 @@ HandleSymbolsFile(XkbFile * file,
static Bool
FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn)
{
- register int i, j;
- register Bool gotOne;
+ int i, j;
+ Bool gotOne;
j = 0;
do
@@ -1742,7 +1742,7 @@ FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn)
static Bool
FindNamedType(XkbDescPtr xkb, Atom name, unsigned *type_rtrn)
{
- register unsigned n;
+ unsigned n;
if (xkb && xkb->map && xkb->map->types)
{
@@ -1960,7 +1960,7 @@ PrepareKeyDef(KeyInfo * key)
static Bool
CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
{
- register int i;
+ int i;
unsigned okc, kc, width, tmp, nGroups;
XkbKeyTypePtr type;
Bool haveActions, autoType, useAlias;
@@ -2213,7 +2213,7 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entry)
Bool
CompileSymbols(XkbFile * file, XkbFileInfo * result, unsigned merge)
{
- register int i;
+ int i;
SymbolsInfo info;
XkbDescPtr xkb;
diff --git a/utils.c b/utils.c
index cba6fec..96f1702 100644
--- a/utils.c
+++ b/utils.c
@@ -328,7 +328,7 @@ uStrCaseCmp(const char *str1, const char *str2)
{
char buf1[512], buf2[512];
char c, *s;
- register int n;
+ int n;
for (n = 0, s = buf1; (c = *str1++); n++)
{
diff --git a/vmod.c b/vmod.c
index 8478386..81f2701 100644
--- a/vmod.c
+++ b/vmod.c
@@ -47,7 +47,7 @@ InitVModInfo(VModInfo * info, XkbDescPtr xkb)
void
ClearVModInfo(VModInfo * info, XkbDescPtr xkb)
{
- register int i;
+ int i;
if (XkbAllocNames(xkb, XkbVirtualModNamesMask, 0, 0) != Success)
return;
@@ -57,7 +57,7 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb)
info->newlyDefined = info->defined = info->available = 0;
if (xkb && xkb->names)
{
- register int bit;
+ int bit;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{
if (xkb->names->vmods[i] != None)
@@ -80,7 +80,7 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb)
Bool
HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
{
- register int i, bit, nextFree;
+ int i, bit, nextFree;
ExprResult mod;
XkbServerMapPtr srv;
XkbNamesPtr names;
@@ -170,9 +170,9 @@ int
LookupVModIndex(XPointer priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
- register int i;
- register char *fieldStr;
- register char *modStr;
+ int i;
+ char *fieldStr;
+ char *modStr;
XkbDescPtr xkb;
xkb = (XkbDescPtr) priv;
@@ -218,7 +218,7 @@ LookupVModMask(XPointer priv,
{
if (LookupVModIndex(priv, elem, field, type, val_rtrn))
{
- register unsigned ndx = val_rtrn->uval;
+ unsigned ndx = val_rtrn->uval;
val_rtrn->uval = (1 << (XkbNumModifiers + ndx));
return True;
}
@@ -247,7 +247,7 @@ ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info)
names = info->xkb->names;
if (def->op == ExprIdent)
{
- register int i, bit;
+ int i, bit;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{
char *str1, *str2;
diff --git a/xkbcomp.c b/xkbcomp.c
index 796fa22..6d43533 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -214,7 +214,7 @@ setVerboseFlags(char *str)
static Bool
parseArgs(int argc, char *argv[])
{
- register int i, tmp;
+ int i, tmp;
i = strlen(argv[0]);
tmp = strlen("xkblist");
diff --git a/xkbpath.c b/xkbpath.c
index 8a5e555..9f620e6 100644
--- a/xkbpath.c
+++ b/xkbpath.c
@@ -178,7 +178,7 @@ XkbAddDefaultDirectoriesToPath(void)
void
XkbClearIncludePath(void)
{
- register int i;
+ int i;
if (szPath > 0)
{
@@ -376,7 +376,7 @@ XkbFindFileInCache(char *name, unsigned type, char **pathRtrn)
FILE *
XkbFindFileInPath(char *name, unsigned type, char **pathRtrn)
{
- register int i;
+ int i;
FILE *file = NULL;
int nameLen, typeLen, pathLen;
char buf[PATH_MAX], *typeDir;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 02:20:01 +0000