diff options
| author | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-06-13 20:39:13 +0200 |
|---|---|---|
| committer | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-06-13 20:39:13 +0200 |
| commit | b1ea463843add37874f9768b606825504cdc8eb2 (patch) | |
| tree | f71f94b967ddc7bf23a174b2ad37db0ffa80ab3d /libpiano | |
| parent | 481f0cdcd0fb33a35865dd8ab30aae6c74f84f20 (diff) | |
| download | pianobar-b1ea463843add37874f9768b606825504cdc8eb2.tar.gz pianobar-b1ea463843add37874f9768b606825504cdc8eb2.tar.bz2 pianobar-b1ea463843add37874f9768b606825504cdc8eb2.zip | |
Hopefully fixed wrong libxml2 usage
We did a xmlCleanupParser () call everytime we finished parsing; this is wrong (http://xmlsoft.org/html/libxml-parser.html#xmlCleanupParser)
Diffstat (limited to 'libpiano')
| -rw-r--r-- | libpiano/main.c | 8 | ||||
| -rw-r--r-- | libpiano/xml.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libpiano/main.c b/libpiano/main.c index e475b59..cc4e65a 100644 --- a/libpiano/main.c +++ b/libpiano/main.c @@ -32,7 +32,9 @@ THE SOFTWARE. #include "xml.h" #include "crypt.h" -/* initialize piano handle, set up curl handle and settings +/* initialize piano handle, set up curl handle and settings; note: you + * _must_ init curl and libxml2 using curl_global_init (CURL_GLOBAL_SSL) + * and xmlInitParser (), you also _must_ cleanup their garbage on your own! * @author PromyLOPh * @added 2008-06-05 * @param piano handle @@ -140,7 +142,9 @@ void PianoDestroyPlaylist (PianoHandle_t *ph) { ph->playlist = NULL; } -/* frees the whole piano handle structure +/* frees the whole piano handle structure; this will _not_ cleanup curl's + * internal garbage, you have to call curl_global_cleanup () and + * xmlCleanupParser () for libxml2 * @author PromyLOPh * @added 2008-06-05 * @param piano handle diff --git a/libpiano/xml.c b/libpiano/xml.c index 048f792..6f8cb55 100644 --- a/libpiano/xml.c +++ b/libpiano/xml.c @@ -203,7 +203,6 @@ void PianoXmlParseUserinfo (PianoHandle_t *ph, char *xml) { PianoXmlStructParser (structRoot, PianoXmlParseUserinfoCb, &ph->user); xmlFreeDoc (doc); - xmlCleanupParser(); } /* parse stations returned by pandora @@ -244,7 +243,6 @@ void PianoXmlParseStations (PianoHandle_t *ph, char *xml) { } xmlFreeDoc (doc); - xmlCleanupParser(); } /* parses playlist; used when searching too @@ -284,7 +282,6 @@ void PianoXmlParsePlaylist (PianoHandle_t *ph, char *xml) { } xmlFreeDoc (doc); - xmlCleanupParser(); } /* parse simple answers like this: <?xml version="1.0" encoding="UTF-8"?> @@ -310,7 +307,6 @@ PianoReturn_t PianoXmlParseSimple (char *xml) { } xmlFreeDoc (doc); - xmlCleanupParser(); return ret; } @@ -413,7 +409,6 @@ void PianoXmlParseSearch (char *searchXml, PianoXmlStructParser (structRoot, PianoXmlParseSearchCb, searchResult); xmlFreeDoc (doc); - xmlCleanupParser(); } /* encode reserved xml chars |