[PATCH 02/15] xfree86: xwin: do not parse -xf86config cmd line option

[Tiago Vignatti]

We have already -config for the same purpose, which is documented and doing
the proper job. Therefore remove superfluous -xf86config option.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/xfree86/common/xf86Init.c |    2 +-
 hw/xwin/winprocarg.c         |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 877ebab..65afa0a 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1071,7 +1071,7 @@ ddxProcessArgument(int argc, char **argv, int i)
       return 2;
     }
   }
-  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
+  if (!strcmp(argv[i], "-config"))
   {
     CHECK_FOR_REQUIRED_ARGUMENT();
     if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 1ce5c2d..c20e455 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -985,8 +985,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
   /*
    * Look for the '-config' argument
    */
-  if (IS_OPTION ("-config")
-      || IS_OPTION ("-xf86config"))
+  if (IS_OPTION ("-config"))
     {
       CHECK_ARGS (1);
 #ifdef XWIN_XF86CONFIG
-- 
1.7.0.4