bluetooth: Check adapter address to set device_info_valid

[pulseaudio] / src / modules / module-detect.c

diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 773e1d8757ca64c6ed714b6131fe194ef8a8e451..7b42d1a0e47c9f008596869a1dafb3ecade8c9cb 100644 (file)
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -7,7 +7,7 @@
 
   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


@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 

-#include <pulse/xmalloc.h>
-

 #include <pulsecore/core-error.h>
 #include <pulsecore/module.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/module.h>
 #include <pulsecore/modargs.h>


@@ -48,8 +46,9 @@
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers");
 PA_MODULE_VERSION(PACKAGE_VERSION);

-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);

 PA_MODULE_USAGE("just-one=<boolean>");
 PA_MODULE_USAGE("just-one=<boolean>");

+PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!");

 
 static const char* const valid_modargs[] = {
     "just-one",
 
 static const char* const valid_modargs[] = {
     "just-one",


@@ -62,7 +61,7 @@ static int detect_alsa(pa_core *c, int just_one) {
     FILE *f;
     int n = 0, n_sink = 0, n_source = 0;
 
     FILE *f;
     int n = 0, n_sink = 0, n_source = 0;
 

-    if (!(f = fopen("/proc/asound/devices", "r"))) {
+    if (!(f = pa_fopen_cloexec("/proc/asound/devices", "r"))) {

 
         if (errno != ENOENT)
             pa_log_error("open(\"/proc/asound/devices\") failed: %s", pa_cstrerror(errno));
 
         if (errno != ENOENT)
             pa_log_error("open(\"/proc/asound/devices\") failed: %s", pa_cstrerror(errno));


@@ -118,14 +117,14 @@ static int detect_alsa(pa_core *c, int just_one) {
 }
 #endif
 
 }
 #endif
 

-#ifdef HAVE_OSS
+#ifdef HAVE_OSS_OUTPUT

 static int detect_oss(pa_core *c, int just_one) {
     FILE *f;
     int n = 0, b = 0;
 
 static int detect_oss(pa_core *c, int just_one) {
     FILE *f;
     int n = 0, b = 0;
 

-    if (!(f = fopen("/dev/sndstat", "r")) &&
-        !(f = fopen("/proc/sndstat", "r")) &&
-        !(f = fopen("/proc/asound/oss/sndstat", "r"))) {
+    if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
+        !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
+        !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {

 
         if (errno != ENOENT)
             pa_log_error("failed to open OSS sndstat device: %s", pa_cstrerror(errno));
 
         if (errno != ENOENT)
             pa_log_error("failed to open OSS sndstat device: %s", pa_cstrerror(errno));


@@ -143,7 +142,7 @@ static int detect_oss(pa_core *c, int just_one) {
         line[strcspn(line, "\r\n")] = 0;
 
         if (!b) {
         line[strcspn(line, "\r\n")] = 0;
 
         if (!b) {

-             b = strcmp(line, "Audio devices:") == 0 || strcmp(line, "Installed devices:") == 0;
+            b = pa_streq(line, "Audio devices:") || pa_streq(line, "Installed devices:");

             continue;
         }
 
             continue;
         }
 


@@ -220,7 +219,7 @@ static int detect_waveout(pa_core *c, int just_one) {
 #endif
 
 int pa__init(pa_module*m) {
 #endif
 
 int pa__init(pa_module*m) {

-    pa_bool_t just_one = FALSE;
+    bool just_one = false;

     int n = 0;
     pa_modargs *ma;
 
     int n = 0;
     pa_modargs *ma;
 


@@ -239,7 +238,7 @@ int pa__init(pa_module*m) {
 #ifdef HAVE_ALSA
     if ((n = detect_alsa(m->core, just_one)) <= 0)
 #endif
 #ifdef HAVE_ALSA
     if ((n = detect_alsa(m->core, just_one)) <= 0)
 #endif

-#ifdef HAVE_OSS
+#ifdef HAVE_OSS_OUTPUT

     if ((n = detect_oss(m->core, just_one)) <= 0)
 #endif
 #ifdef HAVE_SOLARIS
     if ((n = detect_oss(m->core, just_one)) <= 0)
 #endif
 #ifdef HAVE_SOLARIS


@@ -256,7 +255,7 @@ int pa__init(pa_module*m) {
     pa_log_info("loaded %i modules.", n);
 
     /* We were successful and can unload ourselves now. */
     pa_log_info("loaded %i modules.", n);
 
     /* We were successful and can unload ourselves now. */

-    pa_module_unload_request(m, TRUE);
+    pa_module_unload_request(m, true);

 
     pa_modargs_free(ma);
 
 
     pa_modargs_free(ma);