From ce850e04912c609c7998ee4ae404d9bd90ac2d16 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 12 Jun 2008 13:16:09 +0200 Subject: Revert "Replaced strcmp with xmlStrEqual" This reverts commit 305a4ba4885038f05444b9a7e8664c6ff67b66e2. Throws out too many warnings... --- libpiano/xml.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libpiano/xml.c b/libpiano/xml.c index f183c7c..d80d46f 100644 --- a/libpiano/xml.c +++ b/libpiano/xml.c @@ -99,11 +99,11 @@ void PianoXmlParseUserinfoCb (char *key, xmlNode *value, void *data) { valueStr = (char *) value->children->content; } /* FIXME: should be continued later */ - if (xmlStrEqual ("webAuthToken", key)) { + if (strcmp ("webAuthToken", key) == 0) { user->webAuthToken = strdup (valueStr); - } else if (xmlStrEqual ("authToken", key)) { + } else if (strcmp ("authToken", key) == 0) { user->authToken = strdup (valueStr); - } else if (xmlStrEqual ("listenerId", key)) { + } else if (strcmp ("listenerId", key) == 0) { user->listenerId = strdup (valueStr); } } @@ -121,9 +121,9 @@ void PianoXmlParseStationsCb (char *key, xmlNode *value, void *data) { value->children->content != NULL) { valueStr = (char *) value->children->content; } - if (xmlStrEqual ("stationName", key)) { + if (strcmp ("stationName", key) == 0) { station->name = strdup (valueStr); - } else if (xmlStrEqual ("stationId", key)) { + } else if (strcmp ("stationId", key) == 0) { station->id = strdup (valueStr); } } @@ -141,7 +141,7 @@ void PianoXmlParsePlaylistCb (char *key, xmlNode *value, void *data) { value->children->content != NULL) { valueStr = (char *) value->children->content; } - if (xmlStrEqual ("audioURL", key)) { + if (strcmp ("audioURL", key) == 0) { /* last 48 chars of audioUrl are encrypted, but they put the key * into the door's lock; dumb pandora... */ const char urlTailN = 48; @@ -155,19 +155,19 @@ void PianoXmlParsePlaylistCb (char *key, xmlNode *value, void *data) { strncat (song->audioUrl, urlTail, (urlTailN/2)-8); free (urlTail); - } else if (xmlStrEqual ("artistSummary", key)) { + } else if (strcmp ("artistSummary", key) == 0) { song->artist = strdup (valueStr); - } else if (xmlStrEqual ("musicId", key)) { + } else if (strcmp ("musicId", key) == 0) { song->musicId = strdup (valueStr); - } else if (xmlStrEqual ("matchingSeed", key)) { + } else if (strcmp ("matchingSeed", key) == 0) { song->matchingSeed = strdup (valueStr); - } else if (xmlStrEqual ("userSeed", key)) { + } else if (strcmp ("userSeed", key) == 0) { song->userSeed = strdup (valueStr); - } else if (xmlStrEqual ("focusTraitId", key)) { + } else if (strcmp ("focusTraitId", key) == 0) { song->focusTraitId = strdup (valueStr); - } else if (xmlStrEqual ("songTitle", key)) { + } else if (strcmp ("songTitle", key) == 0) { song->title = strdup (valueStr); - } else if (xmlStrEqual ("rating", key)) { + } else if (strcmp ("rating", key) == 0) { if (xmlStrEqual (valueStr, "1")) { song->rating = PIANO_RATE_LOVE; } else { -- cgit v1.2.3