static void cf_somequeue(int (*fn)(disorder_client *c,
struct queue_entry **qp)) {
- struct queue_entry *q;
+ struct queue_entry *q, *qbase;
- if(fn(getclient(), &q)) exit(EXIT_FAILURE);
- while(q) {
+ if(fn(getclient(), &qbase)) exit(EXIT_FAILURE);
+ for(q = qbase; q; q = q->next)
print_queue_entry(q);
- q = q->next;
- }
+ queue_free(qbase, 1);
}
static void cf_recent(char attribute((unused)) **argv) {
}
static void cf_prefs(char **argv) {
- struct kvp *k;
+ struct kvp *k, *base;
- if(disorder_prefs(getclient(), argv[0], &k)) exit(EXIT_FAILURE);
- for(; k; k = k->next)
+ if(disorder_prefs(getclient(), argv[0], &base)) exit(EXIT_FAILURE);
+ for(k = base; k; k = k->next)
xprintf("%s = %s\n",
nullcheck(utf82mb(k->name)), nullcheck(utf82mb(k->value)));
+ kvp_free(base);
}
static void cf_search(char **argv) {
if(disorder_search(getclient(), *argv, &results, &nresults)) exit(EXIT_FAILURE);
for(n = 0; n < nresults; ++n)
xprintf("%s\n", nullcheck(utf82mb(results[n])));
+ free_strings(nresults, results);
}
static void cf_random_disable(char attribute((unused)) **argv) {
static void cf_stats(char attribute((unused)) **argv) {
char **vec;
+ int nvec;
- if(disorder_stats(getclient(), &vec, 0)) exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE);
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_get_volume(char attribute((unused)) **argv) {
static void cf_playlists(char attribute((unused)) **argv) {
char **vec;
+ int nvec;
- if(disorder_playlists(getclient(), &vec, 0))
+ if(disorder_playlists(getclient(), &vec, &nvec))
exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_playlist_del(char **argv) {
static void cf_playlist_get(char **argv) {
char **vec;
+ int nvec;
- if(disorder_playlist_get(getclient(), argv[0], &vec, 0))
+ if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec))
exit(EXIT_FAILURE);
- while(*vec)
- xprintf("%s\n", nullcheck(utf82mb(*vec++)));
+ for(int n = 0; n < nvec; ++n)
+ xprintf("%s\n", nullcheck(utf82mb(vec[n])));
+ free_strings(nvec, vec);
}
static void cf_playlist_set(char **argv) {