queue_save: queue_load_song() returns void
The only caller doesn't use its return value, and the value isn't useful anyway.
This commit is contained in:
parent
b40c0811f4
commit
63c9a20f96
@ -101,8 +101,6 @@ playlist_state_save(FILE *fp, const struct playlist *playlist)
|
|||||||
static void
|
static void
|
||||||
playlist_state_load(FILE *fp, GString *buffer, struct playlist *playlist)
|
playlist_state_load(FILE *fp, GString *buffer, struct playlist *playlist)
|
||||||
{
|
{
|
||||||
int song;
|
|
||||||
|
|
||||||
const char *line = read_text_line(fp, buffer);
|
const char *line = read_text_line(fp, buffer);
|
||||||
if (line == NULL) {
|
if (line == NULL) {
|
||||||
g_warning("No playlist in state file");
|
g_warning("No playlist in state file");
|
||||||
@ -110,7 +108,7 @@ playlist_state_load(FILE *fp, GString *buffer, struct playlist *playlist)
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (!g_str_has_prefix(line, PLAYLIST_STATE_FILE_PLAYLIST_END)) {
|
while (!g_str_has_prefix(line, PLAYLIST_STATE_FILE_PLAYLIST_END)) {
|
||||||
song = queue_load_song(&playlist->queue, line);
|
queue_load_song(&playlist->queue, line);
|
||||||
|
|
||||||
line = read_text_line(fp, buffer);
|
line = read_text_line(fp, buffer);
|
||||||
if (line == NULL) {
|
if (line == NULL) {
|
||||||
|
@ -53,7 +53,7 @@ get_song(const char *uri)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
void
|
||||||
queue_load_song(struct queue *queue, const char *line)
|
queue_load_song(struct queue *queue, const char *line)
|
||||||
{
|
{
|
||||||
long ret;
|
long ret;
|
||||||
@ -61,20 +61,19 @@ queue_load_song(struct queue *queue, const char *line)
|
|||||||
struct song *song;
|
struct song *song;
|
||||||
|
|
||||||
if (queue_is_full(queue))
|
if (queue_is_full(queue))
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
ret = strtol(line, &endptr, 10);
|
ret = strtol(line, &endptr, 10);
|
||||||
if (ret < 0 || *endptr != ':' || endptr[1] == 0) {
|
if (ret < 0 || *endptr != ':' || endptr[1] == 0) {
|
||||||
g_warning("Malformed playlist line in state file");
|
g_warning("Malformed playlist line in state file");
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
line = endptr + 1;
|
line = endptr + 1;
|
||||||
|
|
||||||
song = get_song(line);
|
song = get_song(line);
|
||||||
if (song == NULL)
|
if (song == NULL)
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
queue_append(queue, song);
|
queue_append(queue, song);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
@ -33,10 +33,9 @@ void
|
|||||||
queue_save(FILE *fp, const struct queue *queue);
|
queue_save(FILE *fp, const struct queue *queue);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads one song from the state file line and returns its number.
|
* Loads one song from the state file and appends it to the queue.
|
||||||
* Returns -1 on failure.
|
|
||||||
*/
|
*/
|
||||||
int
|
void
|
||||||
queue_load_song(struct queue *queue, const char *line);
|
queue_load_song(struct queue *queue, const char *line);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user