summaryrefslogtreecommitdiff
path: root/libpiano/main.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@gmail.com>2008-06-12 16:43:28 +0200
committerLars-Dominik Braun <PromyLOPh@gmail.com>2008-06-12 16:44:25 +0200
commitc5819e14350678efc1e2415191848e87f0f21f85 (patch)
treef4296a3f2275f5aa695dd626aa13027cfe36ca47 /libpiano/main.c
parent6d199669a9276053ee709210539b75435e19fa3c (diff)
parent682cd6f7d4dbd3b2d18a7b8c9e375f4143559fcd (diff)
downloadpianobar-c5819e14350678efc1e2415191848e87f0f21f85.tar.gz
pianobar-c5819e14350678efc1e2415191848e87f0f21f85.tar.bz2
pianobar-c5819e14350678efc1e2415191848e87f0f21f85.zip
Merge branch 'deletestation'
Diffstat (limited to 'libpiano/main.c')
-rw-r--r--libpiano/main.c36
1 files changed, 32 insertions, 4 deletions
diff --git a/libpiano/main.c b/libpiano/main.c
index 52d7a1b..17bef4b 100644
--- a/libpiano/main.c
+++ b/libpiano/main.c
@@ -84,6 +84,18 @@ void PianoDestroySearchResult (PianoSearchResult_t *searchResult) {
}
}
+/* free single station
+ * @author PromyLOPh
+ * @added 2008-06-12
+ * @public yes
+ * @param station
+ */
+void PianoDestroyStation (PianoStation_t *station) {
+ free (station->name);
+ free (station->id);
+ memset (station, 0, sizeof (station));
+}
+
/* free complete station list
* @author PromyLOPh
* @added 2008-06-09
@@ -94,11 +106,9 @@ void PianoDestroyStations (PianoHandle_t *ph) {
curStation = ph->stations;
while (curStation != NULL) {
- free (curStation->name);
- free (curStation->id);
lastStation = curStation;
curStation = curStation->next;
- memset (lastStation, 0, sizeof (*lastStation));
+ PianoDestroyStation (lastStation);
free (lastStation);
}
ph->stations = NULL;
@@ -374,7 +384,25 @@ PianoReturn_t PianoDeleteStation (PianoHandle_t *ph, PianoStation_t *station) {
PianoHttpPost (ph->curlHandle, url, requestStr, &retStr);
ret = PianoXmlParseSimple (retStr);
- /* FIXME would be our job to delete station from global station list... */
+ if (ret == PIANO_RET_OK) {
+ /* delete station from local station list */
+ PianoStation_t *curStation = ph->stations, *lastStation = NULL;
+ while (curStation != NULL) {
+ if (curStation == station) {
+ printf ("deleting station\n");
+ if (lastStation != NULL) {
+ lastStation->next = curStation->next;
+ } else {
+ /* first station in list */
+ ph->stations = curStation->next;
+ }
+ PianoDestroyStation (curStation);
+ free (curStation);
+ }
+ lastStation = curStation;
+ curStation = curStation->next;
+ }
+ }
free (requestStr);
free (retStr);