diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-11-04 21:27:12 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-11-04 21:27:12 +0000 |
| commit | 5844a33f0be1af942ee33feae38b9d46169fd61c (patch) | |
| tree | 7a2feaab269107da3131a6baa2932aad3dc4377a /polyp/conf-parser.c | |
| parent | 2aad9e3ae2aa53d13458faf148946cf7e7d87627 (diff) | |
some commenting
change alogrithm for checking for configuration files
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@273 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/conf-parser.c')
| -rw-r--r-- | polyp/conf-parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/polyp/conf-parser.c b/polyp/conf-parser.c index 20e8e723..3d922c20 100644 --- 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; |