diff options
author | Dan Winship <danw@src.gnome.org> | 2000-05-09 06:27:59 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2000-05-09 06:27:59 +0800 |
commit | 65ec43cb553420890c8d14b6c76ce2606674d893 (patch) | |
tree | 227b1c2aa3be87901a1d971578b79cdde5ab557c /camel/camel-stream-buffer.h | |
parent | 3050b3ba056b047a8a1c44c32df5c5eb8558ea58 (diff) | |
download | gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.gz gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.bz2 gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.lz gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.xz gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.tar.zst gsoc2013-evolution-65ec43cb553420890c8d14b6c76ce2606674d893.zip |
Use CamelException to signal failure. (camel_stream_write_strings):
* camel-stream.c (camel_stream_read, camel_stream_write,
camel_stream_flush, camel_stream_reset, camel_stream_printf,
camel_stream_write_to_stream): Use CamelException to signal
failure.
(camel_stream_write_strings): Remove. camel_stream_printf is more
useful in most of the places that used this.
(camel_stream_write_string): Change from macro to function to
prevent problems with double-evaluation.
* camel-seekable-stream.c (camel_seekable_stream_seek,
camel_seekable_stream_set_bounds): Use CamelException.
(reset): Update.
* camel-seekable-substream.c, camel-stream-buffer.c,
camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:
Update.
* camel-stream-fs.c: Remove the virtual init functions and move
the code into the creator functions. Add CamelExceptions to
creation functions that could fail.
* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use
CamelException.
* camel-mime-message.c, camel-mime-part.c, camel-multipart.c
(write_to_stream): Update.
* camel-mime-parser.c: add an exception to the mime parser private
data and pass that to stream functions as needed.
* gmime-content-field.c, md5-utils.c: Update (badly) for stream
changes.
* camel-exception.h (camel_exception_is_set): convenience macro.
* providers/Makefile.am: disable SMTP for now
* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass
CamelException to the functions that now need it. Check the
exception after calling camel_stream_flush, and fail if it fails.
(mbox_get_message_by_uid): More updates.
* providers/pop/camel-pop3-folder.c,
providers/pop/camel-pop3-store.c,
providers/sendmail/camel-sendmail/transport.c: Update.
svn path=/trunk/; revision=2924
Diffstat (limited to 'camel/camel-stream-buffer.h')
-rw-r--r-- | camel/camel-stream-buffer.h | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h index 8f926cd231..33132e39a4 100644 --- a/camel/camel-stream-buffer.h +++ b/camel/camel-stream-buffer.h @@ -1,15 +1,15 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* camel-stream-buffer.h :stream which buffers another stream */ -/* +/* * - * Author : + * Author : * Michael Zucchi <notzed@helixcode.com> * * Copyright 2000 Helix Code Inc. (http://www.helixcode.com) . * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as + * 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 (at your option) any later version. * @@ -42,7 +42,7 @@ extern "C" { #define CAMEL_STREAM_BUFFER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass)) #define CAMEL_IS_STREAM_BUFFER(o) (GTK_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE)) -typedef enum +typedef enum { CAMEL_STREAM_BUFFER_BUFFER = 0, CAMEL_STREAM_BUFFER_NEWLINE, @@ -59,9 +59,7 @@ struct _CamelStreamBuffer /* these are all of course, private */ CamelStream *stream; - unsigned char *buf, - *ptr, - *end; + unsigned char *buf, *ptr, *end; int size; CamelStreamBufferMode mode; @@ -69,16 +67,17 @@ struct _CamelStreamBuffer }; - typedef struct { CamelStreamClass parent_class; - - /* Virtual methods */ - void (*init) (CamelStreamBuffer *stream_buffer, CamelStream *stream, CamelStreamBufferMode mode); - void (*init_vbuf) (CamelStreamBuffer *stream_buffer, CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size); -} CamelStreamBufferClass; + /* Virtual methods */ + void (*init) (CamelStreamBuffer *stream_buffer, CamelStream *stream, + CamelStreamBufferMode mode); + void (*init_vbuf) (CamelStreamBuffer *stream_buffer, + CamelStream *stream, CamelStreamBufferMode mode, + char *buf, guint32 size); +} CamelStreamBufferClass; /* Standard Gtk function */ @@ -86,16 +85,21 @@ GtkType camel_stream_buffer_get_type (void); /* public methods */ -CamelStream *camel_stream_buffer_new (CamelStream *s, CamelStreamBufferMode mode); -CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size); +CamelStream *camel_stream_buffer_new (CamelStream *s, + CamelStreamBufferMode mode); +CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s, + CamelStreamBufferMode mode, + char *buf, guint32 size); /* unimplemented CamelStream *camel_stream_buffer_set_vbuf (CamelStreamBuffer *b, CamelStreamBufferMode mode, char *buf, guint32 size); */ /* read a line of characters */ -int camel_stream_buffer_gets(CamelStreamBuffer *b, char *buf, int max); +int camel_stream_buffer_gets (CamelStreamBuffer *b, char *buf, + unsigned int max, CamelException *ex); -char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf); +char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf, + CamelException *ex); #ifdef __cplusplus } |