util/Error: new error passing library

Replaces GLib's GError.
This commit is contained in:
Max Kellermann
2013-08-10 18:02:44 +02:00
parent c9fcc7f148
commit 29030b54c9
256 changed files with 3269 additions and 3371 deletions

View File

@@ -27,6 +27,7 @@
#include "fs/Path.hxx"
#include "fs/FileSystem.hxx"
#include "util/UriUtil.hxx"
#include "util/Error.hxx"
#include <glib.h>
@@ -99,14 +100,11 @@ bool
playlist_load_spl(struct playlist *playlist, struct player_control *pc,
const char *name_utf8,
unsigned start_index, unsigned end_index,
GError **error_r)
Error &error)
{
GError *error = NULL;
PlaylistFileContents contents = LoadPlaylistFile(name_utf8, &error);
if (contents.empty() && error != nullptr) {
g_propagate_error(error_r, error);
PlaylistFileContents contents = LoadPlaylistFile(name_utf8, error);
if (contents.empty() && error.IsDefined())
return false;
}
if (end_index > contents.size())
end_index = contents.size();