chiark
/
gitweb
/
~mdw
/
disorder
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d047a1
)
More memory hygeine.
author
Richard Kettlewell
<rjk@greenend.org.uk>
Wed, 25 Nov 2009 13:36:11 +0000
(13:36 +0000)
committer
Richard Kettlewell
<rjk@greenend.org.uk>
Wed, 25 Nov 2009 13:36:11 +0000
(13:36 +0000)
clients/disorder.c
patch
|
blob
|
blame
|
history
diff --git
a/clients/disorder.c
b/clients/disorder.c
index 5f5ee4dcea082c8f78e4aa574243251a956fd036..53fce74c778c0b5aaf6c24d634f291b5f24ed731 100644
(file)
--- a/
clients/disorder.c
+++ b/
clients/disorder.c
@@
-294,6
+294,7
@@
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])));
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_random_disable(char attribute((unused)) **argv) {
@@
-306,10
+307,12
@@
static void cf_random_enable(char attribute((unused)) **argv) {
static void cf_stats(char attribute((unused)) **argv) {
char **vec;
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_get_volume(char attribute((unused)) **argv) {
@@
-612,11
+615,13
@@
static void cf_adopt(char **argv) {
static void cf_playlists(char attribute((unused)) **argv) {
char **vec;
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);
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_del(char **argv) {
@@
-626,11
+631,13
@@
static void cf_playlist_del(char **argv) {
static void cf_playlist_get(char **argv) {
char **vec;
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);
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) {
}
static void cf_playlist_set(char **argv) {