Merge commit 'elmarco/dbus'

[pulseaudio] / src / pulsecore / pipe.c

diff --git a/src/pulsecore/pipe.c b/src/pulsecore/pipe.c
index a659915e90bf602ff6d17f1b0f7ca4f9b829ead7..c21e4b1fa582c64f561fbc22a74faa2b99a25f9f 100644 (file)
--- a/src/pulsecore/pipe.c
+++ b/src/pulsecore/pipe.c
@@ -1,13 +1,11 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
-  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+  Copyright 2006-2007 Pierre Ossman <ossman@cendio.se> for Cendio AB
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
@@ -144,19 +142,19 @@ int pipe(int filedes[2]) {
     if ((addr.sin_port != peer.sin_port) || (addr.sin_addr.s_addr != peer.sin_addr.s_addr))
         goto error;
 
-    close(listener);
+    pa_close(listener);
 
     return 0;
 
 error:
-       if (listener >= 0)
-               close(listener);
-       if (filedes[0] >= 0)
-               close(filedes[0]);
-       if (filedes[1] >= 0)
-               close(filedes[0]);
-
-       return -1;
+        if (listener >= 0)
+                pa_close(listener);
+        if (filedes[0] >= 0)
+                pa_close(filedes[0]);
+        if (filedes[1] >= 0)
+                pa_close(filedes[0]);
+
+        return -1;
 }
 
 #endif /* HAVE_PIPE */