X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/05b75f8d50b83e943af3be4071449304d82dbdcd..59ef69ba619917734a8713db0db842ae3edd6086:/lib/sink.h

diff --git a/lib/sink.h b/lib/sink.h
index aab645b..ff763a6 100644
--- a/lib/sink.h
+++ b/lib/sink.h
@@ -1,21 +1,19 @@
 /*
  * 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/sink.h
  * @brief Abstract output sink type
@@ -27,6 +25,7 @@
 #include <stdarg.h>
 
 struct dynstr;
+struct socketio;
 
 /** @brief Sink type
  *
@@ -42,6 +41,20 @@ struct sink {
    * @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);
@@ -58,6 +71,9 @@ struct sink *sink_discard(void);
 struct sink *sink_error(void);
 /* return a sink which fails all writes */
 
+struct sink *sink_socketio(struct socketio *sio);
+/* return a sink which writes to a socket */
+
 int sink_vprintf(struct sink *s, const char *fmt, va_list ap);
 int sink_printf(struct sink *s, const char *fmt, ...)
   attribute((format (printf, 2, 3)));
@@ -82,6 +98,10 @@ static inline int sink_writes(struct sink *s, const char *str) {
   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)
@@ -91,8 +111,11 @@ static inline int sink_writec(struct sink *s, char c) {
   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: