echo-cancel: Add alternative echo-cancellation implementation

[pulseaudio] / src / pulsecore / conf-parser.c

diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index b4ab23cc4279a9956b8a40fe2ea652cfb86febe3..71529557dd7f788ce5a5a714ec53040e05480c1f 100644 (file)
--- a/src/pulsecore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -73,33 +73,6 @@ static int next_assignment(
     return -1;
 }
 
-/* Returns non-zero when c is contained in s */
-static int in_string(char c, const char *s) {
-    pa_assert(s);
-
-    for (; *s; s++)
-        if (*s == c)
-            return 1;
-
-    return 0;
-}
-
-/* Remove all whitepsapce from the beginning and the end of *s. *s may
- * be modified. */
-static char *strip(char *s) {
-    char *b = s+strspn(s, WHITESPACE);
-    char *e, *l = NULL;
-
-    for (e = b; *e; e++)
-        if (!in_string(*e, WHITESPACE))
-            l = e;
-
-    if (l)
-        *(l+1) = 0;
-
-    return b;
-}
-
 /* Parse a variable assignment line */
 static int parse_line(const char *filename, unsigned line, char **section, const pa_config_item *t, char *l, void *userdata) {
     char *e, *c, *b;
@@ -113,10 +86,10 @@ static int parse_line(const char *filename, unsigned line, char **section, const
         return 0;
 
     if (pa_startswith(b, ".include ")) {
-        char *path, *fn;
+        char *path = NULL, *fn;
         int r;
 
-        fn = strip(b+9);
+        fn = pa_strip(b+9);
         if (!pa_is_path_absolute(fn)) {
             const char *k;
             if ((k = strrchr(filename, '/'))) {
@@ -155,7 +128,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const
     *e = 0;
     e++;
 
-    return next_assignment(filename, line, *section, t, strip(b), strip(e), userdata);
+    return next_assignment(filename, line, *section, t, pa_strip(b), pa_strip(e), userdata);
 }
 
 /* Go through the file and parse each line */
@@ -168,7 +141,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void
     pa_assert(filename);
     pa_assert(t);
 
-    if (!f && !(f = fopen(filename, "r"))) {
+    if (!f && !(f = pa_fopen_cloexec(filename, "r"))) {
         if (errno == ENOENT) {
             pa_log_debug("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
             r = 0;