projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use stdbool.h
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
parseutils.c
diff --git
a/src/xkbcomp/parseutils.c
b/src/xkbcomp/parseutils.c
index
06271c3
..
26a9269
100644
(file)
--- a/
src/xkbcomp/parseutils.c
+++ b/
src/xkbcomp/parseutils.c
@@
-28,8
+28,8
@@
#include "xkbmisc.h"
#include "xkbpath.h"
#include "xkbparse.h"
#include "xkbmisc.h"
#include "xkbpath.h"
#include "xkbparse.h"
+
#include <X11/keysym.h>
#include <X11/keysym.h>
-#include <X11/Xalloca.h>
ParseCommon *
AppendStmt(ParseCommon * to, ParseCommon * append)
ParseCommon *
AppendStmt(ParseCommon * to, ParseCommon * append)
@@
-348,7
+348,7
@@
IndicatorMapCreate(xkb_atom_t name, VarDef * body)
}
IndicatorNameDef *
}
IndicatorNameDef *
-IndicatorNameCreate(int ndx, ExprDef * name,
B
ool virtual)
+IndicatorNameCreate(int ndx, ExprDef * name,
b
ool virtual)
{
IndicatorNameDef *def;
{
IndicatorNameDef *def;
@@
-389,7
+389,7
@@
ActionCreate(xkb_atom_t name, ExprDef * args)
return NULL;
}
return NULL;
}
-static
B
ool
+static
b
ool
ResizeKeysymList(ExprDef *list, unsigned int extra)
{
int i;
ResizeKeysymList(ExprDef *list, unsigned int extra)
{
int i;
@@
-407,7
+407,7
@@
ResizeKeysymList(ExprDef *list, unsigned int extra)
if (list->value.list.syms == NULL)
{
FATAL("Couldn't resize list of symbols for append\n");
if (list->value.list.syms == NULL)
{
FATAL("Couldn't resize list of symbols for append\n");
- return
F
alse;
+ return
f
alse;
}
}
if (list->value.list.nLevels >= list->value.list.szLevels)
}
}
if (list->value.list.nLevels >= list->value.list.szLevels)
@@
-423,7
+423,7
@@
ResizeKeysymList(ExprDef *list, unsigned int extra)
if (list->value.list.symsMapIndex == NULL)
{
FATAL("Couldn't resize keysym index map for append\n");
if (list->value.list.symsMapIndex == NULL)
{
FATAL("Couldn't resize keysym index map for append\n");
- return
F
alse;
+ return
f
alse;
}
list->value.list.symsNumEntries =
uTypedRecalloc(list->value.list.symsNumEntries,
}
list->value.list.symsNumEntries =
uTypedRecalloc(list->value.list.symsNumEntries,
@@
-433,13
+433,13
@@
ResizeKeysymList(ExprDef *list, unsigned int extra)
if (list->value.list.symsNumEntries == NULL)
{
FATAL("Couldn't resize num keysym entries for append\n");
if (list->value.list.symsNumEntries == NULL)
{
FATAL("Couldn't resize num keysym entries for append\n");
- return
F
alse;
+ return
f
alse;
}
for (i = list->value.list.nLevels; i < list->value.list.szLevels; i++)
list->value.list.symsMapIndex[i] = -1;
}
}
for (i = list->value.list.nLevels; i < list->value.list.szLevels; i++)
list->value.list.symsMapIndex[i] = -1;
}
- return
T
rue;
+ return
t
rue;
}
ExprDef *
}
ExprDef *
@@
-567,9
+567,9
@@
IncludeCreate(char *str, unsigned merge)
IncludeStmt *incl, *first;
char *file, *map, *stmt, *tmp, *extra_data;
char nextop;
IncludeStmt *incl, *first;
char *file, *map, *stmt, *tmp, *extra_data;
char nextop;
-
B
ool haveSelf;
+
b
ool haveSelf;
- haveSelf =
F
alse;
+ haveSelf =
f
alse;
incl = first = NULL;
file = map = NULL;
tmp = str;
incl = first = NULL;
file = map = NULL;
tmp = str;
@@
-582,7
+582,7
@@
IncludeCreate(char *str, unsigned merge)
{
if (haveSelf)
goto BAIL;
{
if (haveSelf)
goto BAIL;
- haveSelf =
T
rue;
+ haveSelf =
t
rue;
}
if (first == NULL)
first = incl = uTypedAlloc(IncludeStmt);
}
if (first == NULL)
first = incl = uTypedAlloc(IncludeStmt);
@@
-696,7
+696,7
@@
CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags)
file->name = name;
file->defs = defs;
file->id = fileID++;
file->name = name;
file->defs = defs;
file->id = fileID++;
- file->compiled =
F
alse;
+ file->compiled =
f
alse;
file->flags = flags;
}
return file;
file->flags = flags;
}
return file;