Merge remote branch 'vignatti/for-keith'

Conflicts:
	exa/exa.c

Signed-off-by: Keith Packard <keithp@keithp.com>

5 files changed, 7 insertions, 23 deletions

diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 299562592..7d2086802 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef MULTIBUFFER
-    {
-	MultibufferExtensionInit,
-	MULTIBUFFER_PROTOCOL_NAME,
-	&noMultibufferExtension,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef SCREENSAVER
     {
 	ScreenSaverExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 6210526aa..1154e4601 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -9,11 +9,6 @@
 
 #include <X11/extensions/shapeproto.h>
 
-#ifdef MULTIBUFFER
-extern void MultibufferExtensionInit(INITARGS);
-#include <X11/extensions/multibufproto.h>
-#endif
-
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
 #include <X11/extensions/xtestproto.h>
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 4ba8599ab..da57939cf 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -340,14 +340,9 @@ xf86SetSerial (int fd, pointer options)
 
 	if ((xf86SetBoolOption (options, "ClearRTS", FALSE)))
 	{
-#ifdef CLEARRTS_SUPPORT
-		val = TIOCM_RTS;
-		SYSCALL (ioctl(fd, TIOCMBIC, &val));
-#else
 		xf86Msg (X_WARNING,
 			 "Option ClearRTS not supported on this OS\n");
 			return (-1);
-#endif
 		xf86MarkOptionUsedByName (options, "ClearRTS");
 	}
 
diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
index 1091be5e5..4e42b24f0 100644
--- a/hw/xfree86/parser/read.c
+++ b/hw/xfree86/parser/read.c
@@ -219,15 +219,15 @@ xf86readConfigFile (void)
 			}
 			else
 			{
-				Error (INVALID_SECTION_MSG, xf86tokenString ());
 				free(val.str);
 				val.str = NULL;
+				Error (INVALID_SECTION_MSG, xf86tokenString ());
 			}
 			break;
 		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 			free(val.str);
 			val.str = NULL;
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 		}
 	}
 
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 8aab0cf41..06710d55a 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -845,10 +845,13 @@ static int
 ConfigFilter(const struct dirent *de)
 {
 	const char *name = de->d_name;
-	size_t len = strlen(name);
+	size_t len;
 	size_t suflen = strlen(XCONFIGSUFFIX);
 
-	if (!name || name[0] == '.' || len <= suflen)
+	if (!name || name[0] == '.')
+		return 0;
+	len = strlen(name);
+	if(len <= suflen)
 		return 0;
 	if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0)
 		return 0;