Fix false bookmarking error message

(upstream commit c5a89908b05126fd59ea7d4fd42d9570a2ca6228)
This commit is contained in:
dcoppa 2011-07-18 15:04:08 +00:00
parent 98a665c99e
commit 402fb03e7c
2 changed files with 39 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2011/07/11 13:31:14 dcoppa Exp $
# $OpenBSD: Makefile,v 1.18 2011/07/18 15:04:08 dcoppa Exp $
COMMENT = console client for pandora
DISTNAME = pianobar-2011.07.09
REVISION = 0
REVISION = 1
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio

View File

@ -0,0 +1,37 @@
$OpenBSD: patch-src_libpiano_xml_c,v 1.3 2011/07/18 15:04:08 dcoppa Exp $
Fix false bookmarking error message
(upstream commit c5a89908b05126fd59ea7d4fd42d9570a2ca6228)
--- src/libpiano/xml.c.orig Sat Jul 9 10:40:54 2011
+++ src/libpiano/xml.c Mon Jul 18 17:00:10 2011
@@ -560,26 +560,16 @@ PianoReturn_t PianoXmlParsePlaylist (PianoHandle_t *ph
return ret;
}
-/* parse simple answers like this: <?xml version="1.0" encoding="UTF-8"?>
- * <methodResponse><params><param><value>1</value></param></params>
- * </methodResponse>
+/* check for exception only
* @param xml string
- * @return
+ * @return _OK or error
*/
PianoReturn_t PianoXmlParseSimple (char *xml) {
- ezxml_t xmlDoc, dataNode;
+ ezxml_t xmlDoc;
PianoReturn_t ret;
if ((ret = PianoXmlInitDoc (xml, &xmlDoc)) != PIANO_RET_OK) {
return ret;
- }
-
- dataNode = ezxml_get (xmlDoc, "params", 0, "param", 0, "value", -1);
-
- if (strcmp (ezxml_txt (dataNode), "1") == 0) {
- ret = PIANO_RET_OK;
- } else {
- ret = PIANO_RET_ERR;
}
ezxml_free (xmlDoc);