[xserver-commit] xserver/hw/xizzle/common xf86Init.c,3.221,3.222

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/common
In directory pdx:/tmp/cvs-serv26449

Modified Files:
	xf86Init.c 
Log Message:
Get rid of old beta-related code, s/-xf86config/-config/.

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Init.c,v
retrieving revision 3.221
retrieving revision 3.222
diff -u -d -r3.221 -r3.222
--- a/xf86Init.c	10 Mar 2004 13:45:18 -0000	3.221
+++ b/xf86Init.c	10 Mar 2004 13:46:43 -0000	3.222
@@ -275,10 +275,6 @@
     else
       xf86ServerName = argv[0];
 
-#ifdef DO_CHECK_BETA
-    xf86CheckBeta(extraDays, expKey);
-#endif
-
     xf86PrintBanner();
     xf86PrintMarkers();
     if (xf86LogFile)  {
@@ -1273,15 +1269,15 @@
       return 2;
     }
   }
-  if (!strcmp(argv[i], "-xf86config"))
+  if (!strcmp(argv[i], "-config"))
   {
     if (!argv[i + 1])
       return 0;
     if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
-      FatalError("\nInvalid argument for -xf86config\n"
-	  "\tFor non-root users, the file specified with -xf86config must be\n"
+      FatalError("\nInvalid argument for -config\n"
+	  "\tFor non-root users, the file specified with -config must be\n"
 	  "\ta relative path and must not contain any \"..\" elements.\n"
-	  "\tUsing default XF86Config search path.\n\n");
+	  "\tUsing default search path.\n\n");
     }
     xf86ConfigFile = argv[i + 1];
     return 2;