temporarily reverting my camel namespace patches until after we merge in some of the other branches

svn path=/trunk/; revision=22373

1 files changed, 52 insertions, 51 deletions

diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index db85133cbc..25571bfb1c 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-2003 Ximian Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *
@@ -43,26 +43,27 @@ 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 _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 */
+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 */
+
 };
 
 struct _CamelMimeParser {
@@ -74,70 +75,70 @@ struct _CamelMimeParser {
 struct _CamelMimeParserClass {
 	CamelObjectClass parent_class;
 
-	void (*message) (CamelMimeParser *parser, void *headers);
-	void (*part) (CamelMimeParser *parser);
-	void (*content) (CamelMimeParser *parser);
+	void (*message)(CamelMimeParser *, void *headers);
+	void (*part)(CamelMimeParser *);
+	void (*content)(CamelMimeParser *);
 };
 
-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 *parser);
+int		camel_mime_parser_errno		(CamelMimeParser *);
 
 /* using an fd will be a little faster, but not much (over a simple stream) */
-int		camel_mime_parser_init_with_fd (CamelMimeParser *parser, int fd);
-int		camel_mime_parser_init_with_stream (CamelMimeParser *parser, CamelStream *stream);
+int		camel_mime_parser_init_with_fd(CamelMimeParser *, int fd);
+int		camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream);
 
 /* get the stream or fd back of the parser */
-CamelStream    *camel_mime_parser_stream (CamelMimeParser *parser);
-int		camel_mime_parser_fd (CamelMimeParser *parser);
+CamelStream    *camel_mime_parser_stream(CamelMimeParser *m);
+int		camel_mime_parser_fd(CamelMimeParser *m);
 
 /* scan 'From' separators? */
-void camel_mime_parser_scan_from (CamelMimeParser *parser, gboolean scan_from);
+void camel_mime_parser_scan_from(CamelMimeParser *, int);
 /* Do we want to know about the pre-from data? */
-void camel_mime_parser_scan_pre_from (CamelMimeParser *parser, gboolean scan_pre_from);
+void camel_mime_parser_scan_pre_from(CamelMimeParser *, int);
 
 /* what headers to save, MUST include ^Content-Type: */
-int camel_mime_parser_set_header_regex (CamelMimeParser *parser, char *matchstr);
+int camel_mime_parser_set_header_regex(CamelMimeParser *m, char *matchstr);
 
 /* normal interface */
-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);
+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 *);
 
 /* read through the parser */
-int camel_mime_parser_read (CamelMimeParser *parser, const char **databuffer, int len);
+int camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len);
 
 /* get content type for the current part/header */
-CamelContentType *camel_mime_parser_content_type (CamelMimeParser *parser);
+struct _header_content_type *camel_mime_parser_content_type(CamelMimeParser *);
 
 /* get/change raw header by name */
-const char *camel_mime_parser_header (CamelMimeParser *parser, const char *name, int *offset);
+const char *camel_mime_parser_header(CamelMimeParser *, const char *, int *offset);
 
 /* get all raw headers. READ ONLY! */
-struct _camel_header_raw *camel_mime_parser_headers_raw (CamelMimeParser *parser);
+struct _header_raw *camel_mime_parser_headers_raw(CamelMimeParser *);
 
 /* get multipart pre/postface */
-const char *camel_mime_parser_preface (CamelMimeParser *parser);
-const char *camel_mime_parser_postface (CamelMimeParser *parser);
+const char *camel_mime_parser_preface(CamelMimeParser *m);
+const char *camel_mime_parser_postface(CamelMimeParser *m);
 
 /* return the from line content */
-const char *camel_mime_parser_from_line (CamelMimeParser *parser);
+const char *camel_mime_parser_from_line(CamelMimeParser *m);
 
 /* add a processing filter for body contents */
-int camel_mime_parser_filter_add (CamelMimeParser *parser, CamelMimeFilter *filter);
-void camel_mime_parser_filter_remove (CamelMimeParser *parser, int id);
+int camel_mime_parser_filter_add(CamelMimeParser *, CamelMimeFilter *);
+void camel_mime_parser_filter_remove(CamelMimeParser *, int);
 
 /* 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 *parser);
-off_t camel_mime_parser_seek (CamelMimeParser *parser, off_t offset, int whence);
+off_t camel_mime_parser_tell(CamelMimeParser *);
+off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int);
 
-off_t camel_mime_parser_tell_start_headers (CamelMimeParser *parser);
-off_t camel_mime_parser_tell_start_from (CamelMimeParser *parser);
+off_t camel_mime_parser_tell_start_headers(CamelMimeParser *);
+off_t camel_mime_parser_tell_start_from(CamelMimeParser *);
 
 #ifdef __cplusplus
 }