Changeset 664

Timestamp:

Nov 15, 2011, 11:46:55 AM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: fixed a missing return, changed os2_socketpair to os2_pipe

Location:

trunk/server

Files:

• lib/replace/getifaddrs.c (modified) (1 diff)
• lib/tevent/tevent_signal.c (modified) (1 diff)
• source3/lib/os2helper.c (modified) (1 diff)
• source3/lib/recvfile.c (modified) (1 diff)
• source3/lib/select.c (modified) (1 diff)
• source3/nmbd/asyncdns.c (modified) (1 diff)
• source3/printing/print_cups.c (modified) (1 diff)
• source3/printing/printing.c (modified) (1 diff)

trunk/server/lib/replace/getifaddrs.c

@@ -362 +362 @@
                return -1;
         }
+        return 0;
 #endif
 }

trunk/server/lib/tevent/tevent_signal.c

@@ -31 +31 @@
 #include "tevent_util.h"
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif
 

trunk/server/source3/lib/os2helper.c

@@ -177 +177 @@
 */
 
-// OS/2 specific socketpair() implementation, as it only works in low mem
-int os2_socketpair(int fds[2])
+// OS/2 specific pipe implementation, we have to use socketpair as select on filehandle is not working
+// and we have to use local variables to be sure we use low mem, as socketpair doesn't work in high mem
+int os2_pipe(int fds[2])
 {
         int mypair[2];

trunk/server/source3/lib/recvfile.c

@@ -26 +26 @@
 #include "includes.h"
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif
 

trunk/server/source3/lib/select.c

@@ -29 +29 @@
 */
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif
 

trunk/server/source3/nmbd/asyncdns.c

@@ -21 +21 @@
 
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif
 

trunk/server/source3/printing/print_cups.c

@@ -32 +32 @@
 
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif
 

trunk/server/source3/printing/printing.c

@@ -24 +24 @@
 
 #ifdef __OS2__
-#define pipe(A) os2_socketpair(A)
+#define pipe(A) os2_pipe(A)
 #endif