[dovecot-cvs] dovecot/src/lib-mail message-content-parser.c,1.7,1.8 message-content-parser.h,1.5,1.6 message-header-decode.c,1.2,1.3 message-header-decode.h,1.1,1.2 message-parser.c,1.32,1.33 message-parser.h,1.15,1.16 message-tokenize.c,1.2,1.3 Message-Id: <20030111195559.60D1E238CB@danu.procontrol.fi>

cras at procontrol.fi cras at procontrol.fi
Sat Jan 11 21:55:59 EET 2003 

Update of /home/cvs/dovecot/src/lib-mail
In directory danu:/tmp/cvs-serv27659/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:
Naming change for function typedefs.



Index: message-content-parser.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-content-parser.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- message-content-parser.c	5 Jan 2003 13:09:52 -0000	1.7
+++ message-content-parser.c	11 Jan 2003 19:55:56 -0000	1.8
@@ -6,8 +6,8 @@
 #include "message-content-parser.h"
 
 void message_content_parse_header(const unsigned char *data, size_t size,
-				  ParseContentFunc func,
-				  ParseContentParamFunc param_func,
+				  parse_content_callback_t callback,
+				  parse_content_param_callback_t param_cb,
 				  void *context)
 {
 	static const enum message_token stop_tokens[] = { ';', TOKEN_LAST };
@@ -26,12 +26,12 @@
         /* first ';' separates the parameters */
 	message_tokenize_get_string(tok, str, NULL, stop_tokens);
 
-	if (func != NULL)
-		func(str_data(str), str_len(str), context);
+	if (callback != NULL)
+		callback(str_data(str), str_len(str), context);
 
 	t_pop();
 
-	if (param_func != NULL && message_tokenize_get(tok) == ';') {
+	if (param_cb != NULL && message_tokenize_get(tok) == ';') {
 		/* parse the parameters */
 		while ((token = message_tokenize_next(tok)) != TOKEN_LAST) {
 			/* <token> "=" <token> | <quoted-string> */
@@ -48,8 +48,8 @@
 				continue;
 
 			value = message_tokenize_get_value(tok, &value_len);
-			param_func(key, key_len, value, value_len,
-				   token == TOKEN_QSTRING, context);
+			param_cb(key, key_len, value, value_len,
+				 token == TOKEN_QSTRING, context);
 		}
 	}
 

Index: message-content-parser.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-content-parser.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- message-content-parser.h	4 Jan 2003 17:26:30 -0000	1.5
+++ message-content-parser.h	11 Jan 2003 19:55:56 -0000	1.6
@@ -2,17 +2,17 @@
 #define __MESSAGE_CONTENT_PARSER_H
 
 /* NOTE: name and value aren't \0-terminated. */
-typedef void (*ParseContentFunc)(const unsigned char *value, size_t value_len,
-				 void *context);
-typedef void (*ParseContentParamFunc)(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,
-				  ParseContentFunc func,
-				  ParseContentParamFunc param_func,
+				  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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- message-header-decode.c	5 Jan 2003 13:09:52 -0000	1.2
+++ message-header-decode.c	11 Jan 2003 19:55:56 -0000	1.3
@@ -46,7 +46,8 @@
 
 static int
 message_header_decode_encoded(const unsigned char *data, size_t *size,
-			      MessageHeaderDecodeFunc func, void *context)
+			      message_header_decode_callback_t callback,
+			      void *context)
 {
 	const unsigned char *text;
 	const char *charset, *encoding;
@@ -75,15 +76,16 @@
 		}
 	}
 
-	ret = func(buffer_get_data(decodebuf, NULL),
-		   buffer_get_used_size(decodebuf), charset, context);
+	ret = callback(buffer_get_data(decodebuf, NULL),
+		       buffer_get_used_size(decodebuf), charset, context);
 
 	t_pop();
 	return ret;
 }
 
 void message_header_decode(const unsigned char *data, size_t size,
-			   MessageHeaderDecodeFunc func, void *context)
+			   message_header_decode_callback_t callback,
+			   void *context)
 {
 	size_t pos, start_pos, subsize;
 
@@ -93,15 +95,15 @@
 			/* encoded string beginning */
 			if (pos != start_pos) {
 				/* send the unencoded data so far */
-				if (!func(data + start_pos, pos - start_pos,
-					  NULL, context))
+				if (!callback(data + start_pos, pos - start_pos,
+					      NULL, context))
 					return;
 			}
 
 			pos += 2;
 			subsize = size - pos;
 			if (!message_header_decode_encoded(data + pos, &subsize,
-							   func, context))
+							   callback, context))
 				return;
 
 			pos += subsize;
@@ -111,5 +113,5 @@
 		}
 	}
 
-	(void)func(data + start_pos, size - start_pos, NULL, context);
+	(void)callback(data + start_pos, size - start_pos, NULL, context);
 }

Index: message-header-decode.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-header-decode.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- message-header-decode.h	16 Dec 2002 03:26:55 -0000	1.1
+++ message-header-decode.h	11 Jan 2003 19:55:56 -0000	1.2
@@ -3,12 +3,15 @@
 
 /* Return FALSE if you wish to stop decoding. charset is NULL when it's not
    RFC2047-encoded. */
-typedef int (*MessageHeaderDecodeFunc)(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,
-			   MessageHeaderDecodeFunc func, void *context);
+			   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.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- message-parser.c	5 Jan 2003 13:09:52 -0000	1.32
+++ message-parser.c	11 Jan 2003 19:55:56 -0000	1.33
@@ -23,7 +23,7 @@
 	char *last_content_type;
 	struct message_boundary *boundaries;
 
-	MessageHeaderFunc func;
+	message_header_callback_t callback;
 	void *context;
 };
 
@@ -127,9 +127,9 @@
 	struct parser_context *parser_ctx = context;
 
 	/* call the user-defined header parser */
-	if (parser_ctx->func != NULL) {
-		parser_ctx->func(part, name, name_len, value, value_len,
-				 parser_ctx->context);
+	if (parser_ctx->callback != NULL) {
+		parser_ctx->callback(part, name, name_len, value, value_len,
+				     parser_ctx->context);
 	}
 
 	if (name_len == 12 && memcasecmp(name, "Content-Type", 12) == 0) {
@@ -253,14 +253,15 @@
 }
 
 struct message_part *message_parse(pool_t pool, struct istream *input,
-				   MessageHeaderFunc func, void *context)
+				   message_header_callback_t callback,
+				   void *context)
 {
 	struct message_part *part;
 	struct parser_context parser_ctx;
 
 	memset(&parser_ctx, 0, sizeof(parser_ctx));
 	parser_ctx.pool = pool;
-	parser_ctx.func = func;
+	parser_ctx.callback = callback;
 	parser_ctx.context = context;
 	parser_ctx.part = part = p_new(pool, struct message_part, 1);
 
@@ -314,7 +315,7 @@
 
 void message_parse_header(struct message_part *part, struct istream *input,
 			  struct message_size *hdr_size,
-			  MessageHeaderFunc func, void *context)
+			  message_header_callback_t callback, void *context)
 {
 	const unsigned char *msg;
 	size_t i, size, parse_size, startpos, missing_cr_count;
@@ -376,7 +377,8 @@
 			/* make sure the header doesn't continue to next line */
 			if (i+1 == size || !IS_LWSP(msg[i+1])) {
 				if (colon_pos != UINT_MAX &&
-				    colon_pos != line_start && func != NULL &&
+				    colon_pos != line_start &&
+				    callback != NULL &&
 				    !IS_LWSP(msg[line_start])) {
 					/* we have a valid header line */
 
@@ -399,9 +401,10 @@
 					if (msg[i-1] == '\r') value_len--;
 
 					/* and finally call the function */
-					func(part, msg + line_start, name_len,
-					     msg + colon_pos, value_len,
-					     context);
+					callback(part,
+						 msg + line_start, name_len,
+						 msg + colon_pos, value_len,
+						 context);
 				}
 
 				colon_pos = UINT_MAX;
@@ -435,9 +438,9 @@
 		i_assert(hdr_size->virtual_size >= hdr_size->physical_size);
 	}
 
-	if (func != NULL) {
+	if (callback != NULL) {
 		/* "end of headers" notify */
-		func(part, NULL, 0, NULL, 0, context);
+		callback(part, NULL, 0, NULL, 0, context);
 	}
 }
 

Index: message-parser.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-parser.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- message-parser.h	5 Jan 2003 13:09:52 -0000	1.15
+++ message-parser.h	11 Jan 2003 19:55:56 -0000	1.16
@@ -37,22 +37,25 @@
 
 /* NOTE: name and value aren't \0-terminated. Also called once at end of
    headers with name_len = value_len = 0. */
-typedef void (*MessageHeaderFunc)(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);
 
-/* func is called for each field in message header. */
+/* callback is called for each field in message header. */
 struct message_part *message_parse(pool_t pool, struct istream *input,
-				   MessageHeaderFunc func, void *context);
+				   message_header_callback_t callback,
+				   void *context);
 
-/* Call func for each field in message header. Fills the hdr_size.
+/* Call callback for each field in message header. Fills the hdr_size.
    part can be NULL, just make sure your header function works with it.
    This function doesn't use data stack so your header function may save
    values to it. When finished, input will point to beginning of message
    body. */
 void message_parse_header(struct message_part *part, struct istream *input,
 			  struct message_size *hdr_size,
-			  MessageHeaderFunc func, 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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- message-tokenize.c	8 Jan 2003 20:47:19 -0000	1.2
+++ message-tokenize.c	11 Jan 2003 19:55:56 -0000	1.3
@@ -9,7 +9,7 @@
 	const unsigned char *data;
 	size_t size;
 
-	MessageTokenizeErrorFunc error_func;
+	message_tokenize_error_callback_t error_cb;
 	void *error_context;
 
 	int token;
@@ -24,8 +24,8 @@
 
 #define PARSE_ERROR() \
 	STMT_START { \
-	if (tok->error_func != NULL && \
-	    !tok->error_func(data, i, '\0', tok->error_context)) { \
+	if (tok->error_cb != NULL && \
+	    !tok->error_cb(data, i, '\0', tok->error_context)) { \
 		tok->token = TOKEN_LAST; \
 		return TOKEN_LAST; \
 	} \
@@ -33,8 +33,8 @@
 
 #define PARSE_ERROR_MISSING(c) \
 	STMT_START { \
-	if (tok->error_func != NULL && \
-	    !tok->error_func(data, i, c, tok->error_context)) { \
+	if (tok->error_cb != NULL && \
+	    !tok->error_cb(data, i, c, tok->error_context)) { \
 		tok->token = TOKEN_LAST; \
 		return TOKEN_LAST; \
 	} \
@@ -43,7 +43,8 @@
 
 struct message_tokenizer *
 message_tokenize_init(const unsigned char *data, size_t size,
-		      MessageTokenizeErrorFunc error_func, void *error_context)
+		      message_tokenize_error_callback_t error_cb,
+		      void *error_context)
 {
 	struct message_tokenizer *tok;
 
@@ -51,7 +52,7 @@
 	tok->data = data;
 	tok->size = size;
 
-	tok->error_func = error_func;
+	tok->error_cb = error_cb;
 	tok->error_context = error_context;
 
 	tok->skip_comments = TRUE;
@@ -262,8 +263,8 @@
 	tok->parse_pos = i;
 
 	if (tok->token == TOKEN_LAST && tok->in_bracket &&
-	    tok->error_func != NULL) {
-		if (tok->error_func(data, i, '>', tok->error_context))
+	    tok->error_cb != NULL) {
+		if (tok->error_cb(data, i, '>', tok->error_context))
 			tok->token = TOKEN_LAST;
 	}
 

Index: message-tokenize.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-tokenize.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- message-tokenize.h	8 Jan 2003 20:47:19 -0000	1.2
+++ message-tokenize.h	11 Jan 2003 19:55:56 -0000	1.3
@@ -29,15 +29,18 @@
 
    missing_char == '\0': unexpected character at str[pos]
    missing_char != '\0': missing character */
-typedef int (*MessageTokenizeErrorFunc)(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);
 
 /* Tokenize the string. Returns NULL if string is empty. Memory for
    returned array is allocated from data stack. You don't have to use
    the tokens_count, since last token is always 0. */
 struct message_tokenizer *
 message_tokenize_init(const unsigned char *data, size_t size,
-		      MessageTokenizeErrorFunc error_func, void *error_context);
+		      message_tokenize_error_callback_t error_cb,
+		      void *error_context);
 void message_tokenize_deinit(struct message_tokenizer *tok);
 
 /* Specify whether comments should be silently skipped (default yes). */

More information about the dovecot-cvs mailing list