aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/ddxLoad.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-05 14:14:04 +0000
committermarha <marha@users.sourceforge.net>2010-02-05 14:14:04 +0000
commit1cd320f8b4b3d09beb757bea617cac34d36bcb78 (patch)
treea61f78d2a77620096f64bcd794ac0021772974ab /xorg-server/xkb/ddxLoad.c
parent950eb1cc5e0edfc1daf7a69d1803aca794cede14 (diff)
parent7fe172c9035f56977209da12a7fd67d8badd71a2 (diff)
downloadvcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.gz
vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.bz2
vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/ddxLoad.c')
-rw-r--r--xorg-server/xkb/ddxLoad.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index 7f852bd15..bf7adb8e1 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -270,7 +270,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
/* remove the temporary file */
unlink(tmpname);
#endif
- return True;
+ return TRUE;
}
else
LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
@@ -290,7 +290,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
nameRtrn[0]= '\0';
if (buf != NULL)
xfree (buf);
- return False;
+ return FALSE;
}
static FILE *
@@ -390,38 +390,38 @@ Bool complete;
XkbRF_RulesPtr rules;
if (!rules_name)
- return False;
+ return FALSE;
if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {
LogMessage(X_ERROR, "XKB: Rules name is too long\n");
- return False;
+ return FALSE;
}
sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);
file = fopen(buf, "r");
if (!file) {
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
- return False;
+ return FALSE;
}
rules = XkbRF_Create();
if (!rules) {
LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n");
fclose(file);
- return False;
+ return FALSE;
}
if (!XkbRF_LoadRules(file, rules)) {
LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
fclose(file);
- XkbRF_Free(rules,True);
- return False;
+ XkbRF_Free(rules,TRUE);
+ return FALSE;
}
memset(names, 0, sizeof(*names));
complete = XkbRF_GetComponents(rules,defs,names);
fclose(file);
- XkbRF_Free(rules, True);
+ XkbRF_Free(rules, TRUE);
if (!complete)
LogMessage(X_ERROR, "XKB: Rules returned no components\n");