CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

[Izumi Tsutsui]

Module Name:    xsrc
Committed By:   tsutsui
Date:           Tue Aug 11 06:49:09 UTC 2020

Modified Files:
        xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c sunIo.c

Log Message:
Remove more redundant command option arg checks.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h	Tue Aug 11 06:49:09 2020
@@ -298,6 +298,7 @@ extern fbFd		sunFbs[];
 extern Bool		sunSwapLkeys;
 extern Bool		sunForceMono;
 extern Bool		sunDebug;
+extern char		*sunDeviceList;
 extern Bool		sunFlipPixels;
 extern Bool		sunFbInfo;
 extern Bool		sunCG4Frob;

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8	Sun Aug  9 11:51:31 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Tue Aug 11 06:49:09 2020
@@ -131,6 +131,7 @@ static Bool	sunDevsInited = FALSE;
 
 Bool sunSwapLkeys = FALSE;
 Bool sunDebug = FALSE;
+char *sunDeviceList = NULL;
 Bool sunForceMono = FALSE;
 Bool sunFlipPixels = FALSE;
 Bool sunFbInfo = FALSE;
@@ -402,14 +403,9 @@ GetDeviceList(int argc, char **argv)
 {
     int		i;
     char	*envList = NULL;
-    char	*cmdList = NULL;
+    char	*cmdList = sunDeviceList;
     char	**deviceList = NULL;
 
-    for (i = 1; i < argc; i++)
-	if (strcmp (argv[i], "-dev") == 0 && i+1 < argc) {
-	    cmdList = argv[i + 1];
-	    break;
-	}
     if (!cmdList)
 	envList = getenv ("XDEVICE");
 

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Tue Aug 11 06:49:09 2020
@@ -209,7 +209,9 @@ ddxProcessArgument(int argc, char *argv[
 	return 1;
     }
     if (strcmp (argv[i], "-dev") == 0) {	/* -dev /dev/mumble */
-	if (++i >= argc) UseMsg ();
+	if (++i >= argc)
+	    UseMsg();
+	sunDeviceList = argv[i];
 	return 2;
     }
     if (strcmp (argv[i], "-mono") == 0) {	/* -mono */
@@ -228,14 +230,6 @@ ddxProcessArgument(int argc, char *argv[
 	sunFbInfo = TRUE;
 	return 1;
     }
-    if (strcmp (argv[i], "-kbd") == 0) {	/* -kbd */
-	if (++i >= argc) UseMsg();
-	return 2;
-    }
-    if (strcmp (argv[i], "-protect") == 0) {	/* -protect */
-	if (++i >= argc) UseMsg();
-	return 2;
-    }
     if (strcmp (argv[i], "-cg4frob") == 0) {
 	sunCG4Frob = TRUE;
 	return 1;