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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
#include "TextInputStream.hxx"
#include "InputLegacy.hxx"
#include "util/fifo_buffer.h"
#include "util/Error.hxx"
#include <glib.h>
@@ -40,7 +41,6 @@ TextInputStream::~TextInputStream()
bool TextInputStream::ReadLine(std::string &line)
{
GError *error = nullptr;
void *dest;
const char *src, *p;
size_t length, nbytes;
@@ -53,13 +53,13 @@ bool TextInputStream::ReadLine(std::string &line)
newline character */
--length;
Error error;
nbytes = input_stream_lock_read(is, dest, length,
&error);
error);
if (nbytes > 0)
fifo_buffer_append(buffer, nbytes);
else if (error != nullptr) {
g_warning("%s", error->message);
g_error_free(error);
else if (error.IsDefined()) {
g_warning("%s", error.GetMessage());
return false;
}
} else