[xorg-commit-diffs] xc/lib/xtrans Xtranssock.c, 1.1.4.7, 1.1.4.8 Xtransutil.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/xtrans
In directory pdx:/home/eich/tstbuild/xc/lib/xtrans

Modified Files:
      Tag: XORG-CURRENT
	Xtranssock.c Xtransutil.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Xtranssock.c
===================================================================
RCS file: /cvs/xorg/xc/lib/xtrans/Xtranssock.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/Xtranssock.c	5 Mar 2004 13:39:44 -0000	1.1.4.7
+++ b/Xtranssock.c	15 Apr 2004 10:15:12 -0000	1.1.4.8
@@ -865,9 +865,10 @@
 	if (errno == EADDRINUSE) {
 	    if (flags & ADDR_IN_USE_ALLOWED)
 		break;
-	} else
-	    return TRANS_ADDR_IN_USE;
-
+	    else
+		return TRANS_ADDR_IN_USE;
+	}
+	
 	if (retry-- == 0) {
 	    PRMSG (1, "SocketCreateListener: failed to bind listener\n",
 		0, 0, 0);

Index: Xtransutil.c
===================================================================
RCS file: /cvs/xorg/xc/lib/xtrans/Xtransutil.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Xtransutil.c	5 Mar 2004 13:39:44 -0000	1.1.4.3
+++ b/Xtransutil.c	15 Apr 2004 10:15:12 -0000	1.1.4.4
@@ -573,14 +573,14 @@
 	    if (updateOwner && !updatedOwner) {
 	  	PRMSG(1, "mkdir: Owner of %s should be set to root\n",
 		      path, 0, 0);
-#if !defined(__CYGWIN__) && !defined(__DARWIN__)
+#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__)
 		sleep(5);
 #endif
 	    }
 	    if (updateMode && !updatedMode) {
 	  	PRMSG(1, "mkdir: Mode of %s should be set to %04o\n",
 		      path, mode, 0);
-#if !defined(__CYGWIN__) && !defined(__DARWIN__)
+#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__)
 		sleep(5);
 #endif
 	    }