queue_save: simplify get_song()

Don't try db_get_song() if the URI has a scheme.

queue_save: simplify get_song()
8341a9f7 · Max Kellermann · b233c145 · 8341a9f7
Commit 8341a9f7 authored Jul 25, 2010 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 10 deletions

queue_save.c src/queue_save.c +3 -10

No files found.
--- a/src/queue_save.c
+++ b/src/queue_save.c
@@ -45,16 +45,9 @@ queue_save(FILE *fp, const struct queue *queue)
 static struct song *
 get_song(const char *uri)
 {
-	struct song *song;
-
-	song = db_get_song(uri);
-	if (song != NULL)
-		return song;
-
-	if (uri_has_scheme(uri))
-		return song_remote_new(uri);
-
-	return NULL;
+	return uri_has_scheme(uri)
+		? song_remote_new(uri)
+		: db_get_song(uri);
 }

 void