summaryrefslogtreecommitdiff
path: root/symbols.c
diff options
context:
space:
mode:
Diffstat (limited to 'symbols.c')
-rw-r--r--symbols.c32
1 files changed, 16 insertions, 16 deletions
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;