diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-02-17 18:48:52 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-02-18 14:49:23 -0800 |
| commit | d2cf562bbad553d7f09b70202134f5b6ada0114e (patch) | |
| tree | 6eea659f206518f2f080d90426f9f58cdd850a34 | |
| parent | 344b1f2b25d627bdf7d802c5831b6a72d22ffe34 (diff) | |
Make RgbPath keyword in xorg.conf a non-fatal error
Xorg shouldn't refuse to run just because the user has an xorg.conf that
had the previously-used RgbPath keyword in it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/parser/Files.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/parser/xf86tokens.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index 2f77c0e7c..c3523024d 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -73,6 +73,8 @@ static xf86ConfigSymTabRec FilesTab[] = {INPUTDEVICES, "inputdevices"}, {LOGFILEPATH, "logfile"}, {XKBDIR, "xkbdir"}, + /* Obsolete keywords that aren't used but shouldn't cause errors: */ + {OBSOLETE_TOKEN, "rgbpath"}, {-1, ""}, }; @@ -189,6 +191,10 @@ xf86parseFilesSection (void) case EOF_TOKEN: Error (UNEXPECTED_EOF_MSG, NULL); break; + case OBSOLETE_TOKEN: + xf86parseError (OBSOLETE_MSG, xf86tokenString ()); + xf86getSubToken (&(ptr->file_comment)); + break; default: Error (INVALID_KEYWORD_MSG, xf86tokenString ()); break; diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 8091f09d3..b2d23508d 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -70,6 +70,7 @@ typedef enum { /* errno-style tokens */ + OBSOLETE_TOKEN = -5, EOF_TOKEN = -4, LOCK_TOKEN = -3, ERROR_TOKEN = -2, |