[PATCH 2/2] Obsolete InputDevices keyword in xorg.conf Files section

[Alan Coopersmith]

Was only used to provide a list of input devices that XF86-Misc could use,
now that XF86-Misc is gone, was parsed and logged, then completely ignored.

(Depends on previous patch that introduces OBSOLETE_TOKEN in parser to
 make obsolete keywords like InputDevices & RGBPath be non-fatal errors.)

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 hw/xfree86/common/xf86Config.c  |    8 -------
 hw/xfree86/common/xf86Globals.c |    1 -
 hw/xfree86/common/xf86Priv.h    |    1 -
 hw/xfree86/parser/Files.c       |   45 +--------------------------------------
 hw/xfree86/parser/xf86Parser.h  |    1 -
 hw/xfree86/parser/xf86tokens.h  |    1 -
 6 files changed, 1 insertions(+), 56 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index a70b1d6..b067ff9 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -644,14 +644,6 @@ configFiles(XF86ConfFilesPtr fileconf)
     strcpy(temp_path, start);
     xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
     xfree(log_buf);
-
-
-  if (fileconf && fileconf->file_inputdevs) {
-      xf86InputDeviceList = fileconf->file_inputdevs;
-      xf86Msg(X_CONFIG, "Input device list set to \"%s\"\n",
-	  xf86InputDeviceList);
-  }
-  
   
   /* ModulePath */
 
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index c277369..bb9b687 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -139,7 +139,6 @@ xf86InfoRec xf86Info = {
 #endif
 };
 const char *xf86ConfigFile = NULL;
-const char *xf86InputDeviceList = NULL;
 const char *xf86ModulePath = DEFAULT_MODULE_PATH;
 MessageType xf86ModPathFrom = X_DEFAULT;
 const char *xf86LogFile = DEFAULT_LOGPREFIX;
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 8457443..b539e96 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -75,7 +75,6 @@ extern _X_EXPORT  struct pci_slot_match xf86IsolateDevice;
 /* Other parameters */
 
 extern _X_EXPORT  xf86InfoRec xf86Info;
-extern _X_EXPORT  const char *xf86InputDeviceList;
 extern _X_EXPORT  const char *xf86ModulePath;
 extern _X_EXPORT  MessageType xf86ModPathFrom;
 extern _X_EXPORT  const char *xf86LogFile;
diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
index 11c635b..49dc1e1 100644
--- a/hw/xfree86/parser/Files.c
+++ b/hw/xfree86/parser/Files.c
@@ -70,10 +70,10 @@ static xf86ConfigSymTabRec FilesTab[] =
 	{ENDSECTION, "endsection"},
 	{FONTPATH, "fontpath"},
 	{MODULEPATH, "modulepath"},
-	{INPUTDEVICES, "inputdevices"},
 	{LOGFILEPATH, "logfile"},
 	/* Obsolete keywords that aren't used but shouldn't cause errors: */
 	{OBSOLETE_TOKEN, "rgbpath"},
+	{OBSOLETE_TOKEN, "inputdevices"},
 	{-1, ""},
 };
 
@@ -150,33 +150,6 @@ xf86parseFilesSection (void)
 			strcat (ptr->file_modulepath, str);
 			xf86conffree (val.str);
 			break;
-		case INPUTDEVICES:
-			if (xf86getSubToken (&(ptr->file_comment)) != STRING)
-				Error (QUOTE_MSG, "InputDevices");
-			l = FALSE;
-			str = val.str;
-			if (ptr->file_inputdevs == NULL)
-			{
-				ptr->file_inputdevs = xf86confmalloc (1);
-				ptr->file_inputdevs[0] = '\0';
-				k = strlen (str) + 1;
-			}
-			else
-			{
-				k = strlen (ptr->file_inputdevs) + strlen (str) + 1;
-				if (ptr->file_inputdevs[strlen (ptr->file_inputdevs) - 1] != ',')
-				{
-					k++;
-					l = TRUE;
-				}
-			}
-			ptr->file_inputdevs = xf86confrealloc (ptr->file_inputdevs, k);
-			if (l)
-				strcat (ptr->file_inputdevs, ",");
-
-			strcat (ptr->file_inputdevs, str);
-			xf86conffree (val.str);
-			break;
 		case LOGFILEPATH:
 			if (xf86getSubToken (&(ptr->file_comment)) != STRING)
 				Error (QUOTE_MSG, "LogFile");
@@ -231,21 +204,6 @@ xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr)
 		}
 		fprintf (cf, "\tModulePath   \"%s\"\n", s);
 	}
-	if (ptr->file_inputdevs)
-	{
-		s = ptr->file_inputdevs;
-		p = index (s, ',');
-		while (p)
-		{
-			*p = '\000';
-			fprintf (cf, "\tInputDevices   \"%s\"\n", s);
-			*p = ',';
-			s = p;
-			s++;
-			p = index (s, ',');
-		}
-		fprintf (cf, "\tInputDevices   \"%s\"\n", s);
-	}
 	if (ptr->file_fontpath)
 	{
 		s = ptr->file_fontpath;
@@ -271,7 +229,6 @@ xf86freeFiles (XF86ConfFilesPtr p)
 
 	TestFree (p->file_logfile);
 	TestFree (p->file_modulepath);
-	TestFree (p->file_inputdevs);
 	TestFree (p->file_fontpath);
 	TestFree (p->file_comment);
 
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 0444b03..2f4f07b 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -72,7 +72,6 @@ typedef struct
 {
 	char *file_logfile;
 	char *file_modulepath;
-	char *file_inputdevs;
 	char *file_fontpath;
 	char *file_comment;
 }
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index dd67f72..084403d 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -99,7 +99,6 @@ typedef enum {
     /* File tokens */
     FONTPATH,
     MODULEPATH,
-    INPUTDEVICES,
     LOGFILEPATH,
 
     /* Server Flag tokens.  These are deprecated in favour of generic Options */
-- 
1.5.6.5