summaryrefslogtreecommitdiff
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-02-13 02:23:59 (GMT)
committer Alan Coopersmith <alan.coopersmith@sun.com>2009-02-13 02:23:59 (GMT)
commitbd713794ceaa1b2890522554562103c0a2d50f04 (patch) (side-by-side diff)
tree2d37ee3e2cd7bf6a577e4de02562cbab79499756
parentd229ba7068f0adf1bc8b30b7ccf2fce2c7e8b97b (diff)
downloadxserver-bd713794ceaa1b2890522554562103c0a2d50f04.zip
xserver-bd713794ceaa1b2890522554562103c0a2d50f04.tar.gz
Correct error message if specified config file is not found
By making the "Unable to open config file" header a warning, it was not appearing with the filename when a config file was specified and not found. Now we make it an error message again, but only issue the error if a filename was specified - if none was specified, then we don't even issue a warning, just the "Using autoconfig" info message. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/common/xf86Config.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 953af45..a70b1d6 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2448,10 +2448,9 @@ xf86HandleConfigFile(Bool autoconfig)
xf86MsgVerb(from, 0, "Using config file: \"%s\"\n", filename);
xf86ConfigFile = xnfstrdup(filename);
} else {
- xf86Msg(X_WARNING, "Unable to locate/open config file");
if (xf86ConfigFile)
- xf86ErrorFVerb(0, ": \"%s\"", xf86ConfigFile);
- xf86ErrorFVerb(0, "\n");
+ xf86Msg(X_ERROR, "Unable to locate/open config file: \"%s\"\n",
+ xf86ConfigFile);
return CONFIG_NOFILE;
}
}