[dovecot-cvs] dovecot/src/lib-mail message-content-parser.c,1.8,1.9 message-content-parser.h,1.6,1.7 message-header-decode.c,1.3,1.4 message-header-decode.h,1.2,1.3 message-parser.c,1.33,1.34 message-parser.h,1.17,1.18 message-tokenize.c,1.3,1.4 Message-Id: <20030127020002.6D7F423995@danu.procontrol.fi>

cras at procontrol.fi cras at procontrol.fi
Mon Jan 27 04:00:02 EET 2003


Update of /home/cvs/dovecot/src/lib-mail
In directory danu:/tmp/cvs-serv24859/src/lib-mail

Modified Files:
	message-content-parser.c message-content-parser.h 
	message-header-decode.c message-header-decode.h 
	message-parser.c message-parser.h message-tokenize.c 
	message-tokenize.h 
Log Message:
Function typedefs now define them as functions, not function pointers.



Index: message-content-parser.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-content-parser.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- message-content-parser.c	11 Jan 2003 19:55:56 -0000	1.8
+++ message-content-parser.c	27 Jan 2003 02:00:00 -0000	1.9
@@ -6,8 +6,8 @@
 #include "message-content-parser.h"
 
 void message_content_parse_header(const unsigned char *data, size_t size,
-				  parse_content_callback_t callback,
-				  parse_content_param_callback_t param_cb,
+				  parse_content_callback_t *callback,
+				  parse_content_param_callback_t *param_cb,
 				  void *context)
 {
 	static const enum message_token stop_tokens[] = { ';', TOKEN_LAST };

Index: message-content-parser.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-content-parser.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- message-content-parser.h	11 Jan 2003 19:55:56 -0000	1.6
+++ message-content-parser.h	27 Jan 2003 02:00:00 -0000	1.7
@@ -2,17 +2,17 @@
 #define __MESSAGE_CONTENT_PARSER_H
 
 /* NOTE: name and value aren't \0-terminated. */
-typedef void (*parse_content_callback_t)(const unsigned char *value,
-					 size_t value_len, void *context);
-typedef void (*parse_content_param_callback_t)(const unsigned char *name,
-					       size_t name_len,
-					       const unsigned char *value,
-					       size_t value_len,
-					       int value_quoted, void *context);
+typedef void parse_content_callback_t(const unsigned char *value,
+				      size_t value_len, void *context);
+typedef void parse_content_param_callback_t(const unsigned char *name,
+					    size_t name_len,
+					    const unsigned char *value,
+					    size_t value_len,
+					    int value_quoted, void *context);
 
 void message_content_parse_header(const unsigned char *data, size_t size,
-				  parse_content_callback_t callback,
-				  parse_content_param_callback_t param_cb,
+				  parse_content_callback_t *callback,
+				  parse_content_param_callback_t *param_cb,
 				  void *context);
 
 #endif

Index: message-header-decode.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-header-decode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- message-header-decode.c	11 Jan 2003 19:55:56 -0000	1.3
+++ message-header-decode.c	27 Jan 2003 02:00:00 -0000	1.4
@@ -46,7 +46,7 @@
 
 static int
 message_header_decode_encoded(const unsigned char *data, size_t *size,
-			      message_header_decode_callback_t callback,
+			      message_header_decode_callback_t *callback,
 			      void *context)
 {
 	const unsigned char *text;
@@ -84,7 +84,7 @@
 }
 
 void message_header_decode(const unsigned char *data, size_t size,
-			   message_header_decode_callback_t callback,
+			   message_header_decode_callback_t *callback,
 			   void *context)
 {
 	size_t pos, start_pos, subsize;

Index: message-header-decode.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-header-decode.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- message-header-decode.h	11 Jan 2003 19:55:56 -0000	1.2
+++ message-header-decode.h	27 Jan 2003 02:00:00 -0000	1.3
@@ -3,15 +3,14 @@
 
 /* Return FALSE if you wish to stop decoding. charset is NULL when it's not
    RFC2047-encoded. */
-typedef int (*message_header_decode_callback_t)(const unsigned char *data,
-						size_t size,
-						const char *charset,
-						void *context);
+typedef int message_header_decode_callback_t(const unsigned char *data,
+					     size_t size, const char *charset,
+					     void *context);
 
 /* Decode RFC2047 encoded words. Call specified function for each
    decoded block. */
 void message_header_decode(const unsigned char *data, size_t size,
-			   message_header_decode_callback_t callback,
+			   message_header_decode_callback_t *callback,
 			   void *context);
 
 #endif

Index: message-parser.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-parser.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- message-parser.c	11 Jan 2003 19:55:56 -0000	1.33
+++ message-parser.c	27 Jan 2003 02:00:00 -0000	1.34
@@ -23,7 +23,7 @@
 	char *last_content_type;
 	struct message_boundary *boundaries;
 
-	message_header_callback_t callback;
+	message_header_callback_t *callback;
 	void *context;
 };
 
@@ -253,7 +253,7 @@
 }
 
 struct message_part *message_parse(pool_t pool, struct istream *input,
-				   message_header_callback_t callback,
+				   message_header_callback_t *callback,
 				   void *context)
 {
 	struct message_part *part;
@@ -315,7 +315,7 @@
 
 void message_parse_header(struct message_part *part, struct istream *input,
 			  struct message_size *hdr_size,
-			  message_header_callback_t callback, void *context)
+			  message_header_callback_t *callback, void *context)
 {
 	const unsigned char *msg;
 	size_t i, size, parse_size, startpos, missing_cr_count;

Index: message-parser.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-parser.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- message-parser.h	20 Jan 2003 14:52:51 -0000	1.17
+++ message-parser.h	27 Jan 2003 02:00:00 -0000	1.18
@@ -33,16 +33,16 @@
 
 /* NOTE: name and value aren't \0-terminated. Also called once at end of
    headers with name_len = value_len = 0. */
-typedef void (*message_header_callback_t)(struct message_part *part,
-					  const unsigned char *name,
-					  size_t name_len,
-					  const unsigned char *value,
-					  size_t value_len,
-					  void *context);
+typedef void message_header_callback_t(struct message_part *part,
+				       const unsigned char *name,
+				       size_t name_len,
+				       const unsigned char *value,
+				       size_t value_len,
+				       void *context);
 
 /* callback is called for each field in message header. */
 struct message_part *message_parse(pool_t pool, struct istream *input,
-				   message_header_callback_t callback,
+				   message_header_callback_t *callback,
 				   void *context);
 
 /* Call callback for each field in message header. Fills the hdr_size.
@@ -52,6 +52,6 @@
    body. */
 void message_parse_header(struct message_part *part, struct istream *input,
 			  struct message_size *hdr_size,
-			  message_header_callback_t callback, void *context);
+			  message_header_callback_t *callback, void *context);
 
 #endif

Index: message-tokenize.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-tokenize.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- message-tokenize.c	11 Jan 2003 19:55:56 -0000	1.3
+++ message-tokenize.c	27 Jan 2003 02:00:00 -0000	1.4
@@ -9,7 +9,7 @@
 	const unsigned char *data;
 	size_t size;
 
-	message_tokenize_error_callback_t error_cb;
+	message_tokenize_error_callback_t *error_cb;
 	void *error_context;
 
 	int token;
@@ -43,7 +43,7 @@
 
 struct message_tokenizer *
 message_tokenize_init(const unsigned char *data, size_t size,
-		      message_tokenize_error_callback_t error_cb,
+		      message_tokenize_error_callback_t *error_cb,
 		      void *error_context)
 {
 	struct message_tokenizer *tok;

Index: message-tokenize.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-tokenize.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- message-tokenize.h	20 Jan 2003 14:52:51 -0000	1.4
+++ message-tokenize.h	27 Jan 2003 02:00:00 -0000	1.5
@@ -29,17 +29,16 @@
 
    missing_char == '\0': unexpected character at str[pos]
    missing_char != '\0': missing character */
-typedef int (*message_tokenize_error_callback_t)(const unsigned char *str,
-						 size_t pos,
-						 char missing_char,
-						 void *context);
+typedef int message_tokenize_error_callback_t(const unsigned char *str,
+					      size_t pos, char missing_char,
+					      void *context);
 
 /* Initialize message tokenizer. data is parsed until \0 is found, or size
    bytes has been parsed, so it's possible to give (size_t)-1 as size
    if the string is \0 terminated. */
 struct message_tokenizer *
 message_tokenize_init(const unsigned char *data, size_t size,
-		      message_tokenize_error_callback_t error_cb,
+		      message_tokenize_error_callback_t *error_cb,
 		      void *error_context);
 void message_tokenize_deinit(struct message_tokenizer *tok);
 




More information about the dovecot-cvs mailing list