dbus: memory leak, actually free dbus wrapper

[pulseaudio] / src / pulsecore / sioman.c

diff --git a/src/pulsecore/sioman.c b/src/pulsecore/sioman.c
index 4d5d5562d66e70d113e0fe66d3c2ad25375cbf9f..24c046cf91b6454b74b041748f5d0278554dea43 100644 (file)
--- a/src/pulsecore/sioman.c
+++ b/src/pulsecore/sioman.c
@@ -1,11 +1,11 @@
-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 

+  Copyright 2004-2006 Lennart Poettering
+

   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   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
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -23,21 +23,17 @@
 #include <config.h>
 #endif
 
 #include <config.h>
 #endif
 

-#include <assert.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/atomic.h>

 
 #include "sioman.h"
 
 
 #include "sioman.h"
 

-static int stdio_inuse = 0;
+static pa_atomic_t stdio_inuse = PA_ATOMIC_INIT(0);

 
 int pa_stdio_acquire(void) {
 
 int pa_stdio_acquire(void) {

-    if (stdio_inuse)
-        return -1;
-
-    stdio_inuse = 1;
-    return 0;
+    return pa_atomic_cmpxchg(&stdio_inuse, 0, 1) ? 0 : -1;

 }
 
 void pa_stdio_release(void) {
 }
 
 void pa_stdio_release(void) {

-    assert(stdio_inuse);
-    stdio_inuse = 0;
+    pa_assert_se(pa_atomic_cmpxchg(&stdio_inuse, 1, 0));

 }
 }