[dovecot-cvs] dovecot/src/lib-storage/index index-fetch-section.c,1.23,1.24 index-storage.c,1.22,1.23

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index
In directory danu:/tmp/cvs-serv13893/lib-storage/index

Modified Files:
	index-fetch-section.c index-storage.c 
Log Message:
t_strsplit() returns now const char **, which removes a few nasty casts.
Removed a few unneded functions and did some small cleanups.



Index: index-fetch-section.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-fetch-section.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- index-fetch-section.c	21 Dec 2002 22:02:58 -0000	1.23
+++ index-fetch-section.c	22 Dec 2002 08:18:29 -0000	1.24
@@ -12,6 +12,16 @@
 #include <ctype.h>
 #include <unistd.h>
 
+typedef struct {
+	String *dest;
+	OStream *output;
+	uoff_t dest_size;
+
+	uoff_t skip, max_size;
+	const char **fields;
+	int (*match_func) (const char **, const char *, size_t);
+} FetchHeaderFieldContext;
+
 /* For FETCH[HEADER.FIELDS*] we need to modify the header data before sending
    it. We can either save it in memory and then send it, or we can parse it
    twice, first calculating the size and then send it. This value specifies
@@ -67,16 +77,16 @@
 			    cr_skipped ? 1 : 0, sect->max_size);
 }
 
-static char *const *get_fields_array(const char *fields)
+static const char **get_fields_array(const char *fields)
 {
-	char **field_list, **field;
+	const char **field_list, **field;
 
 	while (*fields == ' ')
 		fields++;
 	if (*fields == '(')
 		fields++;
 
-	field_list = (char **) t_strsplit(fields, " )");
+	field_list = t_strsplit(fields, " )");
 
 	/* array ends at ")" element */
 	for (field = field_list; *field != NULL; field++) {
@@ -87,7 +97,7 @@
 	return field_list;
 }
 
-static int header_match(char *const *fields, const char *name, size_t size)
+static int header_match(const char **fields, const char *name, size_t size)
 {
 	const char *field, *name_start, *name_end;
 
@@ -120,12 +130,12 @@
 	return FALSE;
 }
 
-static int header_match_not(char *const *fields, const char *name, size_t size)
+static int header_match_not(const char **fields, const char *name, size_t size)
 {
 	return !header_match(fields, name, size);
 }
 
-static int header_match_mime(char *const *fields __attr_unused__,
+static int header_match_mime(const char **fields __attr_unused__,
 			     const char *name, size_t size)
 {
 	if (size > 8 && strncasecmp(name, "Content-", 8) == 0)
@@ -136,16 +146,6 @@
 
 	return FALSE;
 }
-
-typedef struct {
-	String *dest;
-	OStream *output;
-	uoff_t dest_size;
-
-	uoff_t skip, max_size;
-	char *const *fields;
-	int (*match_func) (char *const *, const char *, size_t);
-} FetchHeaderFieldContext;
 
 static int fetch_header_append(FetchHeaderFieldContext *ctx,
 			       const char *str, size_t size)

Index: index-storage.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-storage.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- index-storage.c	21 Dec 2002 22:28:07 -0000	1.22
+++ index-storage.c	22 Dec 2002 08:18:29 -0000	1.23
@@ -90,7 +90,7 @@
 		NULL
 	};
 
-	char *const *arr;
+	const char *const *arr;
 	MailDataField ret;
 	int i;