From fba13bd5d218f0fd73d2f4017302aef9d075b35c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 25 Jun 2010 22:01:18 +0200
Subject: [PATCH] playlist_queue: simplify error handler
Return early on error, save one level of indent.
---
src/playlist_queue.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/playlist_queue.c b/src/playlist_queue.c
index 9241d4774..dd5d0dd4a 100644
--- a/src/playlist_queue.c
+++ b/src/playlist_queue.c
@@ -103,16 +103,15 @@ playlist_open_into_queue(const char *uri, struct playlist *dest)
struct input_stream *is;
struct playlist_provider *playlist = playlist_mapper_open(uri, &is);
- if (playlist != NULL) {
- enum playlist_result result =
- playlist_load_into_queue(uri, playlist, dest);
- playlist_plugin_close(playlist);
+ if (playlist == NULL)
+ return PLAYLIST_RESULT_NO_SUCH_LIST;
- if (is != NULL)
- input_stream_close(is);
+ enum playlist_result result =
+ playlist_load_into_queue(uri, playlist, dest);
+ playlist_plugin_close(playlist);
- return result;
- }
+ if (is != NULL)
+ input_stream_close(is);
- return PLAYLIST_RESULT_NO_SUCH_LIST;
+ return result;
}