s/HSCAN_/CAMEL_MIME_PARSER_STATE_/g and

2003-08-26  Jeffrey Stedfast  <fejj@ximian.com>

	* 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: ...

svn path=/trunk/; revision=22365

1 files changed, 22 insertions, 23 deletions

diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index b95fe69f5b..db85133cbc 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -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 {
@@ -103,10 +102,10 @@ void camel_mime_parser_scan_pre_from (CamelMimeParser *parser, gboolean scan_pre
 int camel_mime_parser_set_header_regex (CamelMimeParser *parser, char *matchstr);
 
 /* normal interface */
-enum _header_state camel_mime_parser_step (CamelMimeParser *parser, char **buf, size_t *buflen);
+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 _header_state camel_mime_parser_state (CamelMimeParser *parser);
+enum _camel_mime_parser_state camel_mime_parser_state (CamelMimeParser *parser);
 
 /* read through the parser */
 int camel_mime_parser_read (CamelMimeParser *parser, const char **databuffer, int len);