--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-17  Bruno Haible  <bruno@clisp.org>
+
+	pipe2: Simplify code.
+	* lib/pipe2.c (pipe2): Reduce code duplication.
+
 2011-04-17  Bruno Haible  <bruno@clisp.org>
 
 	nonblocking: Add comment.

--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -66,23 +66,17 @@
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Native Woe32 API.  */
 
+  if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
+    return -1;
+
   if (flags & O_NONBLOCK)
     {
-      int result = _pipe (fd, 4096, flags & ~O_NONBLOCK);
-      if (result != 0)
-        return result;
       if (set_nonblocking_flag (fd[0], true) != 0
           || set_nonblocking_flag (fd[1], true) != 0)
-        {
-          int saved_errno = errno;
-          close (fd[0]);
-          close (fd[1]);
-          result = -1;
-          errno = saved_errno;
-        }
-      return result;
+        goto fail;
     }
-  return _pipe (fd, 4096, flags);
+
+  return 0;
 
 #else
 /* Unix API.  */
@@ -131,6 +125,8 @@
 
   return 0;
 
+#endif
+
  fail:
   {
     int saved_errno = errno;
@@ -139,6 +135,4 @@
     errno = saved_errno;
     return -1;
   }
-
-#endif
 }