modules: Fix resource leak in oss

[pulseaudio] / src / modules / reserve-wrap.c

diff --git a/src/modules/reserve-wrap.c b/src/modules/reserve-wrap.c
index 6086fc994a5e1fc65e46cf5b9d967703b99f29b5..9c69d59c2a3555d37706e99c8e62e901ccfa1696 100644 (file)
--- a/src/modules/reserve-wrap.c
+++ b/src/modules/reserve-wrap.c
@@ -26,10 +26,10 @@
 #include <errno.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/shared.h>
 
 #ifdef HAVE_DBUS
@@ -105,9 +105,9 @@ static int request_cb(rd_device *d, int forced) {
 
 pa_reserve_wrapper* pa_reserve_wrapper_get(pa_core *c, const char *device_name) {
     pa_reserve_wrapper *r;
-    int k;
     char *t;
 #ifdef HAVE_DBUS
+    int k;
     DBusError error;
 
     dbus_error_init(&error);
@@ -137,7 +137,7 @@ pa_reserve_wrapper* pa_reserve_wrapper_get(pa_core *c, const char *device_name)
 
 #ifdef HAVE_DBUS
     if (!(r->connection = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
-        pa_log_warn("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
+        pa_log_debug("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
 
         /* We don't treat this as error here because we want allow PA
          * to run even when no session bus is available. */
@@ -154,10 +154,10 @@ pa_reserve_wrapper* pa_reserve_wrapper_get(pa_core *c, const char *device_name)
                  NULL)) < 0) {
 
         if (k == -EBUSY) {
-            pa_log_error("Device '%s' already locked.", device_name);
+            pa_log_debug("Device '%s' already locked.", device_name);
             goto fail;
         } else {
-            pa_log_warn("Failed to acquire reservation lock on device '%s': %s", device_name, pa_cstrerror(-k));
+            pa_log_debug("Failed to acquire reservation lock on device '%s': %s", device_name, pa_cstrerror(-k));
             return r;
         }
     }
@@ -248,9 +248,9 @@ static void change_cb(rm_monitor *m) {
 
 pa_reserve_monitor_wrapper* pa_reserve_monitor_wrapper_get(pa_core *c, const char *device_name) {
     pa_reserve_monitor_wrapper *w;
-    int k;
     char *t;
 #ifdef HAVE_DBUS
+    int k;
     DBusError error;
 
     dbus_error_init(&error);
@@ -280,7 +280,7 @@ pa_reserve_monitor_wrapper* pa_reserve_monitor_wrapper_get(pa_core *c, const cha
 
 #ifdef HAVE_DBUS
     if (!(w->connection = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
-        pa_log_warn("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
+        pa_log_debug("Unable to contact D-Bus session bus: %s: %s", error.name, error.message);
 
         /* We don't treat this as error here because we want allow PA
          * to run even when no session bus is available. */
@@ -294,7 +294,7 @@ pa_reserve_monitor_wrapper* pa_reserve_monitor_wrapper_get(pa_core *c, const cha
                  change_cb,
                  NULL)) < 0) {
 
-        pa_log_warn("Failed to create watch on device '%s': %s", device_name, pa_cstrerror(-k));
+        pa_log_debug("Failed to create watch on device '%s': %s", device_name, pa_cstrerror(-k));
         goto fail;
     }
 
@@ -331,7 +331,7 @@ pa_hook* pa_reserve_monitor_wrapper_hook(pa_reserve_monitor_wrapper *w) {
     return &w->hook;
 }
 
-pa_bool_t pa_reserve_monitor_wrapper_busy(pa_reserve_monitor_wrapper *w) {
+bool pa_reserve_monitor_wrapper_busy(pa_reserve_monitor_wrapper *w) {
     pa_assert(w);
 
     pa_assert(PA_REFCNT_VALUE(w) >= 1);
@@ -339,6 +339,6 @@ pa_bool_t pa_reserve_monitor_wrapper_busy(pa_reserve_monitor_wrapper *w) {
 #ifdef HAVE_DBUS
     return rm_busy(w->monitor) > 0;
 #else
-    return FALSE;
+    return false;
 #endif
 }