/*
* This file is part of DisOrder
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007-9, 2013 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "mem.h"
#include "vector.h"
-#include "sink.h"
#include "log.h"
+#include "sink.h"
#include "printf.h"
/** @brief Formatted output to a sink
return n;
}
+static int sink_generic_flush(struct sink attribute((unused)) *s) {
+ return 0;
+}
+
+static int sink_generic_error(struct sink attribute((unused)) *s) {
+ return 0;
+}
+
/* stdio sink *****************************************************************/
/** @brief Sink that writes to a stdio @c FILE */
/** @brief Stream to write to */
FILE *fp;
+
+ int error;
};
/** @brief Reinterpret a @ref sink as a @ref stdio_sink */
static int sink_stdio_write(struct sink *s, const void *buffer, int nbytes) {
int n = fwrite(buffer, 1, nbytes, S(s)->fp);
if(n < nbytes) {
+ S(s)->error = errno;
if(S(s)->name)
disorder_fatal(errno, "error writing to %s", S(s)->name);
else
return n;
}
+static int sink_stdio_error(struct sink *s) {
+ return S(s)->error;
+}
+
/** @brief Create a sink that writes to a stdio stream
* @param name Filename for use in error messages
* @param fp Stream to write to
struct stdio_sink *s = xmalloc(sizeof *s);
s->s.write = sink_stdio_write;
+ s->s.flush = sink_generic_flush;
+ s->s.error = sink_stdio_error;
+ s->s.eclass = ec_errno;
s->name = name;
s->fp = fp;
return (struct sink *)s;
struct dynstr_sink *s = xmalloc(sizeof *s);
s->s.write = sink_dynstr_write;
+ s->s.flush = sink_generic_flush;
+ s->s.error = sink_generic_error;
+ s->s.eclass = ec_errno;
s->d = output;
return (struct sink *)s;
}
struct sink *s = xmalloc(sizeof *s);
s->write = sink_discard_write;
+ s->flush = sink_generic_flush;
+ s->error = sink_generic_error;
+ s->eclass = ec_errno;
return s;
}
struct sink *s = xmalloc(sizeof *s);
s->write = sink_error_write;
+ s->flush = sink_generic_flush;
+ s->error = sink_generic_error;
+ s->eclass = ec_errno;
return s;
}
/*
* This file is part of DisOrder
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008, 2013 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* @return non-negative on success, -1 on error
*/
int (*write)(struct sink *s, const void *buffer, int nbytes);
+
+ /** @brief Flush callback
+ * @param s Sink to write to
+ * @return non-negative on success, -1 on error
+ */
+ int (*flush)(struct sink *s);
+
+ /** @brief Error callback
+ * @param s Sink
+ * @return Last error code
+ */
+ int (*error)(struct sink *s);
+
+ enum error_class eclass;
};
struct sink *sink_stdio(const char *name, FILE *fp);
return s->write(s, str, strlen(str));
}
+static inline int sink_flush(struct sink *s) {
+ return s->flush(s);
+}
+
/** @brief Write one byte to a sink
* @param s Sink to write to
* @param c Byte to write (as a @c char)
return s->write(s, &c, 1);
}
-#endif /* SINK_H */
+static inline int sink_err(struct sink *s) {
+ return s->error(s);
+}
+#endif /* SINK_H */
/*
Local Variables: