From df21ede0c7bb0cf36ff095400e38d46950a030a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 18 Sep 2003 17:07:09 +0000 Subject: s/HSCAN_/CAMEL_MIME_PARSER_STATE_/g and 2003-08-26 Jeffrey Stedfast * camel-mime-parser.[c,h]: s/HSCAN_/CAMEL_MIME_PARSER_STATE_/g and s/_header_state/_camel_mime_parser_state/g * camel-filter-driver.c: Same. * camel-folder-summary.c: Here too. * camel-http-stream.c: And here. * camel-mime-message.c: ... * camel-mime-part-utils.c: ... * camel-mime-part.c: ... * camel-movemail.c: ... * camel-multipart-signed.c: ... * camel-multipart.c: ... * providers/local/camel-mbox-folder.c: ... * providers/local/camel-mbox-summary.c: ... * providers/local/camel-mh-summary.c: ... * providers/nntp/camel-nntp-summary.c: ... * providers/pop3/camel-pop3-folder.c: ... 2003-08-25 Jeffrey Stedfast * camel-mime-utils.[c,h]: Namespaced. * camel-data-wrapper.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-digest-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-filter-driver.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-filter-search.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-folder-search.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-folder-summary.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-http-stream.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-http-stream.h: updated for namespace changed made to camel-mime-utils.[c,h] * camel-internet-address.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-medium.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-message.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-parser.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-part-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-part.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-movemail.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart-encrypted.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart-signed.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-search-private.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-types.h: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-store-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imapp/camel-imapp-utils.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-local-summary.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-maildir-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-mbox-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-spool-summary.h: updated for namespace changed made to camel-mime-utils.[c,h] * providers/nntp/camel-nntp-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/nntp/camel-nntp-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/pop3/camel-pop3-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/sendmail/camel-sendmail-transport.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/smtp/camel-smtp-transport.c: updated for namespace changed made to camel-mime-utils.[c,h] svn path=/trunk/; revision=22613 --- camel/camel-mime-parser.h | 103 +++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 52 deletions(-) (limited to 'camel/camel-mime-parser.h') diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h index 25571bfb1c..db85133cbc 100644 --- a/camel/camel-mime-parser.h +++ b/camel/camel-mime-parser.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 2000 Ximian Inc. + * Copyright (C) 2000-2003 Ximian Inc. * * Authors: Michael Zucchi * @@ -43,27 +43,26 @@ typedef struct _CamelMimeParserClass CamelMimeParserClass; /* NOTE: if you add more states, you may need to bump the start of the END tags to 16 or 32, etc - so they are the same as the matching start tag, with a bit difference */ -enum _header_state { - HSCAN_INITIAL, - HSCAN_PRE_FROM, /* data before a 'From' line */ - HSCAN_FROM, /* got 'From' line */ - HSCAN_HEADER, /* toplevel header */ - HSCAN_BODY, /* scanning body of message */ - HSCAN_MULTIPART, /* got multipart header */ - HSCAN_MESSAGE, /* rfc822 message */ - - HSCAN_PART, /* part of a multipart */ - - HSCAN_END = 8, /* bit mask for 'end' flags */ - - HSCAN_EOF = 8, /* end of file */ - HSCAN_PRE_FROM_END, /* pre from end */ - HSCAN_FROM_END, /* end of whole from bracket */ - HSCAN_HEADER_END, /* dummy value */ - HSCAN_BODY_END, /* end of message */ - HSCAN_MULTIPART_END, /* end of multipart */ - HSCAN_MESSAGE_END, /* end of message */ - +enum _camel_mime_parser_state { + CAMEL_MIME_PARSER_STATE_INITIAL, + CAMEL_MIME_PARSER_STATE_PRE_FROM, /* data before a 'From' line */ + CAMEL_MIME_PARSER_STATE_FROM, /* got 'From' line */ + CAMEL_MIME_PARSER_STATE_HEADER, /* toplevel header */ + CAMEL_MIME_PARSER_STATE_BODY, /* scanning body of message */ + CAMEL_MIME_PARSER_STATE_MULTIPART, /* got multipart header */ + CAMEL_MIME_PARSER_STATE_MESSAGE, /* rfc822 message */ + + CAMEL_MIME_PARSER_STATE_PART, /* part of a multipart */ + + CAMEL_MIME_PARSER_STATE_END = 8, /* bit mask for 'end' flags */ + + CAMEL_MIME_PARSER_STATE_EOF = 8, /* end of file */ + CAMEL_MIME_PARSER_STATE_PRE_FROM_END, /* pre from end */ + CAMEL_MIME_PARSER_STATE_FROM_END, /* end of whole from bracket */ + CAMEL_MIME_PARSER_STATE_HEADER_END, /* dummy value */ + CAMEL_MIME_PARSER_STATE_BODY_END, /* end of message */ + CAMEL_MIME_PARSER_STATE_MULTIPART_END, /* end of multipart */ + CAMEL_MIME_PARSER_STATE_MESSAGE_END, /* end of message */ }; struct _CamelMimeParser { @@ -75,70 +74,70 @@ struct _CamelMimeParser { struct _CamelMimeParserClass { CamelObjectClass parent_class; - void (*message)(CamelMimeParser *, void *headers); - void (*part)(CamelMimeParser *); - void (*content)(CamelMimeParser *); + void (*message) (CamelMimeParser *parser, void *headers); + void (*part) (CamelMimeParser *parser); + void (*content) (CamelMimeParser *parser); }; -CamelType camel_mime_parser_get_type (void); -CamelMimeParser *camel_mime_parser_new (void); +CamelType camel_mime_parser_get_type (void); +CamelMimeParser *camel_mime_parser_new (void); /* quick-fix for parser not erroring, we can find out if it had an error afterwards */ -int camel_mime_parser_errno (CamelMimeParser *); +int camel_mime_parser_errno (CamelMimeParser *parser); /* using an fd will be a little faster, but not much (over a simple stream) */ -int camel_mime_parser_init_with_fd(CamelMimeParser *, int fd); -int camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream); +int camel_mime_parser_init_with_fd (CamelMimeParser *parser, int fd); +int camel_mime_parser_init_with_stream (CamelMimeParser *parser, CamelStream *stream); /* get the stream or fd back of the parser */ -CamelStream *camel_mime_parser_stream(CamelMimeParser *m); -int camel_mime_parser_fd(CamelMimeParser *m); +CamelStream *camel_mime_parser_stream (CamelMimeParser *parser); +int camel_mime_parser_fd (CamelMimeParser *parser); /* scan 'From' separators? */ -void camel_mime_parser_scan_from(CamelMimeParser *, int); +void camel_mime_parser_scan_from (CamelMimeParser *parser, gboolean scan_from); /* Do we want to know about the pre-from data? */ -void camel_mime_parser_scan_pre_from(CamelMimeParser *, int); +void camel_mime_parser_scan_pre_from (CamelMimeParser *parser, gboolean scan_pre_from); /* what headers to save, MUST include ^Content-Type: */ -int camel_mime_parser_set_header_regex(CamelMimeParser *m, char *matchstr); +int camel_mime_parser_set_header_regex (CamelMimeParser *parser, char *matchstr); /* normal interface */ -enum _header_state camel_mime_parser_step(CamelMimeParser *, char **, size_t *); -void camel_mime_parser_unstep(CamelMimeParser *); -void camel_mime_parser_drop_step(CamelMimeParser *m); -enum _header_state camel_mime_parser_state(CamelMimeParser *); +enum _camel_mime_parser_state camel_mime_parser_step (CamelMimeParser *parser, char **buf, size_t *buflen); +void camel_mime_parser_unstep (CamelMimeParser *parser); +void camel_mime_parser_drop_step (CamelMimeParser *parser); +enum _camel_mime_parser_state camel_mime_parser_state (CamelMimeParser *parser); /* read through the parser */ -int camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len); +int camel_mime_parser_read (CamelMimeParser *parser, const char **databuffer, int len); /* get content type for the current part/header */ -struct _header_content_type *camel_mime_parser_content_type(CamelMimeParser *); +CamelContentType *camel_mime_parser_content_type (CamelMimeParser *parser); /* get/change raw header by name */ -const char *camel_mime_parser_header(CamelMimeParser *, const char *, int *offset); +const char *camel_mime_parser_header (CamelMimeParser *parser, const char *name, int *offset); /* get all raw headers. READ ONLY! */ -struct _header_raw *camel_mime_parser_headers_raw(CamelMimeParser *); +struct _camel_header_raw *camel_mime_parser_headers_raw (CamelMimeParser *parser); /* get multipart pre/postface */ -const char *camel_mime_parser_preface(CamelMimeParser *m); -const char *camel_mime_parser_postface(CamelMimeParser *m); +const char *camel_mime_parser_preface (CamelMimeParser *parser); +const char *camel_mime_parser_postface (CamelMimeParser *parser); /* return the from line content */ -const char *camel_mime_parser_from_line(CamelMimeParser *m); +const char *camel_mime_parser_from_line (CamelMimeParser *parser); /* add a processing filter for body contents */ -int camel_mime_parser_filter_add(CamelMimeParser *, CamelMimeFilter *); -void camel_mime_parser_filter_remove(CamelMimeParser *, int); +int camel_mime_parser_filter_add (CamelMimeParser *parser, CamelMimeFilter *filter); +void camel_mime_parser_filter_remove (CamelMimeParser *parser, int id); /* these should be used with caution, because the state will not track the seeked position */ /* FIXME: something to bootstrap the state? */ -off_t camel_mime_parser_tell(CamelMimeParser *); -off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int); +off_t camel_mime_parser_tell (CamelMimeParser *parser); +off_t camel_mime_parser_seek (CamelMimeParser *parser, off_t offset, int whence); -off_t camel_mime_parser_tell_start_headers(CamelMimeParser *); -off_t camel_mime_parser_tell_start_from(CamelMimeParser *); +off_t camel_mime_parser_tell_start_headers (CamelMimeParser *parser); +off_t camel_mime_parser_tell_start_from (CamelMimeParser *parser); #ifdef __cplusplus } -- cgit v1.2.3