some commenting

[pulseaudio] / polyp / conf-parser.c

diff --git a/polyp/conf-parser.c b/polyp/conf-parser.c
index 20e8e723bbcddef612d1d50fe33226db8affcfec..3d922c209f55ec4b435f1a39ff3ffb7b71aff794 100644 (file)
--- a/polyp/conf-parser.c
+++ b/polyp/conf-parser.c
@@ -89,13 +89,13 @@ static int parse_line(const char *filename, unsigned line, const struct pa_confi
 }
 
 
-int pa_config_parse(const char *filename, const struct pa_config_item *t, void *userdata) {
-    FILE *f;
+int pa_config_parse(const char *filename, FILE *f, const struct pa_config_item *t, void *userdata) {
     int r = -1;
     unsigned line = 0;
+    int do_close = !f;
     assert(filename && t);
     
-    if (!(f = fopen(filename, "r"))) {
+    if (!f && !(f = fopen(filename, "r"))) {
         if (errno == ENOENT) {
             r = 0;
             goto finish;
@@ -123,7 +123,7 @@ int pa_config_parse(const char *filename, const struct pa_config_item *t, void *
     
 finish:
 
-    if (f)
+    if (do_close && f)
         fclose(f);
     
     return r;