xserver: Branch 'server-1.4-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Tue May 13 18:11:26 PDT 2008
xkb/ddxLoad.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d0554a57489e272233bcb38cb453f2c0bc0b1729
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Tue May 13 16:39:30 2008 -0700
When XKB fails to open rules file, log the file name, not the NULL file pointer
(cherry picked from commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0)
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index ea9c3ff..eb03cde 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -525,7 +525,7 @@ XkbRF_RulesPtr rules;
file = fopen(buf, "r");
if (!file) {
- LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file);
+ LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
return False;
}
More information about the xorg-commit
mailing list