oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

storedPlaylist: cleanup API and avoid needless heap allocations + error checks

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7119 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2008-01-01 10:09:31 +00:00
parent 390ed29740
commit 09936358fa
3 changed files with 69 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/playlist.c
View File

@@ -1516,11 +1516,12 @@ int getPlaylistSongId(int song)
int PlaylistInfo(int fd, char *utf8file, int detail)
{
ListNode *node;
StoredPlaylist *sp = loadStoredPlaylist(utf8file, fd);
if (sp == NULL)
StoredPlaylist sp;
if (loadStoredPlaylist(fd, &sp, utf8file) < 0)
return -1;
node = sp->list->firstNode;
node = sp.list->firstNode;
while (node != NULL) {
char *temp = node->data;
int wrote = 0;
@@ -1540,18 +1541,19 @@ int PlaylistInfo(int fd, char *utf8file, int detail)
node = node->nextNode;
}
freeStoredPlaylist(sp);
freeStoredPlaylist(&sp);
return 0;
}
int loadPlaylist(int fd, char *utf8file)
{
ListNode *node;
StoredPlaylist *sp = loadStoredPlaylist(utf8file, fd);
if (sp == NULL)
StoredPlaylist sp;
if (loadStoredPlaylist(fd, &sp, utf8file) < 0)
return -1;
node = sp->list->firstNode;
node = sp.list->firstNode;
while (node != NULL) {
char *temp = node->data;
if ((addToPlaylist(STDERR_FILENO, temp, 0)) < 0) {
@@ -1573,7 +1575,7 @@ int loadPlaylist(int fd, char *utf8file)
node = node->nextNode;
}
freeStoredPlaylist(sp);
freeStoredPlaylist(&sp);
return 0;
}