[dovecot-cvs] dovecot/src/lib-charset charset-iconv.c,1.12,1.13 charset-utf8.c,1.6,1.7 charset-utf8.h,1.6,1.7

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-charset
In directory danu:/tmp/cvs-serv25916/src/lib-charset

Modified Files:
	charset-iconv.c charset-utf8.c charset-utf8.h 
Log Message:
Naming style changes, finally got tired of most of the typedefs. Also the
previous enum -> macro change reverted so that we don't use the highest bit
anymore, that's incompatible with old indexes so they will be rebuilt.



Index: charset-iconv.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-charset/charset-iconv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- charset-iconv.c	4 Jan 2003 17:26:29 -0000	1.12
+++ charset-iconv.c	5 Jan 2003 13:09:51 -0000	1.13
@@ -15,15 +15,15 @@
 #  define ICONV_CONST
 #endif
 
-struct _CharsetTranslation {
+struct charset_translation {
 	iconv_t cd;
 	int ascii;
 };
 
-CharsetTranslation *charset_to_utf8_begin(const char *charset,
-					  int *unknown_charset)
+struct charset_translation *charset_to_utf8_begin(const char *charset,
+						  int *unknown_charset)
 {
-	CharsetTranslation *t;
+	struct charset_translation *t;
 	iconv_t cd;
 	int ascii;
 
@@ -48,33 +48,34 @@
 		}
 	}
 
-	t = i_new(CharsetTranslation, 1);
+	t = i_new(struct charset_translation, 1);
 	t->cd = cd;
 	t->ascii = ascii;
 	return t;
 }
 
-void charset_to_utf8_end(CharsetTranslation *t)
+void charset_to_utf8_end(struct charset_translation *t)
 {
 	if (t->cd != NULL)
 		iconv_close(t->cd);
 	i_free(t);
 }
 
-void charset_to_utf8_reset(CharsetTranslation *t)
+void charset_to_utf8_reset(struct charset_translation *t)
 {
 	if (t->cd != NULL)
 		(void)iconv(t->cd, NULL, NULL, NULL, NULL);
 }
 
-CharsetResult
-charset_to_ucase_utf8(CharsetTranslation *t,
-		      const unsigned char *src, size_t *src_size, Buffer *dest)
+enum charset_result
+charset_to_ucase_utf8(struct charset_translation *t,
+		      const unsigned char *src, size_t *src_size,
+		      buffer_t *dest)
 {
 	ICONV_CONST char *ic_srcbuf;
 	char *ic_destbuf;
 	size_t srcleft, destpos, destleft, size;
-        CharsetResult ret;
+        enum charset_result ret;
 
 	destpos = buffer_get_used_size(dest);
 	destleft = buffer_get_size(dest) - destpos;

Index: charset-utf8.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-charset/charset-utf8.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- charset-utf8.c	4 Jan 2003 17:26:29 -0000	1.6
+++ charset-utf8.c	5 Jan 2003 13:09:51 -0000	1.7
@@ -7,7 +7,7 @@
 #include <ctype.h>
 
 void _charset_utf8_ucase(const unsigned char *src, size_t src_size,
-			 Buffer *dest, size_t destpos)
+			 buffer_t *dest, size_t destpos)
 {
 	char *destbuf;
 	size_t i;
@@ -20,7 +20,7 @@
 const char *_charset_utf8_ucase_strdup(const unsigned char *data, size_t size,
 				       size_t *utf8_size_r)
 {
-	Buffer *dest;
+	buffer_t *dest;
 
 	dest = buffer_create_dynamic(data_stack_pool, size, (size_t)-1);
 	_charset_utf8_ucase(data, size, dest, 0);
@@ -39,10 +39,10 @@
 	int dummy;
 };
 
-static CharsetTranslation ascii_translation, utf8_translation;
+static struct charset_translation ascii_translation, utf8_translation;
 
-CharsetTranslation *charset_to_utf8_begin(const char *charset,
-					  int *unknown_charset)
+struct charset_translation *charset_to_utf8_begin(const char *charset,
+						  int *unknown_charset)
 {
 	if (unknown_charset != NULL)
 		*unknown_charset = FALSE;
@@ -61,17 +61,18 @@
 	return NULL;
 }
 
-void charset_to_utf8_end(CharsetTranslation *t __attr_unused__)
+void charset_to_utf8_end(struct charset_translation *t __attr_unused__)
 {
 }
 
-void charset_to_utf8_reset(CharsetTranslation *t __attr_unused__)
+void charset_to_utf8_reset(struct charset_translation *t __attr_unused__)
 {
 }
 
-CharsetResult
-charset_to_ucase_utf8(CharsetTranslation *t __attr_unused__,
-		      const unsigned char *src, size_t *src_size, Buffer *dest)
+enum charset_result
+charset_to_ucase_utf8(struct charset_translation *t __attr_unused__,
+		      const unsigned char *src, size_t *src_size,
+		      buffer_t *dest)
 {
 	size_t destpos, destleft;
 

Index: charset-utf8.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-charset/charset-utf8.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- charset-utf8.h	17 Dec 2002 04:28:41 -0000	1.6
+++ charset-utf8.h	5 Jan 2003 13:09:51 -0000	1.7
@@ -1,28 +1,27 @@
 #ifndef __CHARSET_UTF8_H
 #define __CHARSET_UTF8_H
 
-typedef enum {
+enum charset_result {
 	CHARSET_RET_OK = 1,
 	CHARSET_RET_OUTPUT_FULL = 0,
 	CHARSET_RET_INCOMPLETE_INPUT = -1,
 	CHARSET_RET_INVALID_INPUT = -2
-} CharsetResult;
-
-typedef struct _CharsetTranslation CharsetTranslation;
+};
 
 /* Begin translation to UTF-8. */
-CharsetTranslation *charset_to_utf8_begin(const char *charset,
-					  int *unknown_charset);
+struct charset_translation *charset_to_utf8_begin(const char *charset,
+						  int *unknown_charset);
 
-void charset_to_utf8_end(CharsetTranslation *t);
+void charset_to_utf8_end(struct charset_translation *t);
 
-void charset_to_utf8_reset(CharsetTranslation *t);
+void charset_to_utf8_reset(struct charset_translation *t);
 
 /* Translate src to UTF-8. If src_size is updated to contain the number of
    characters actually translated from src. */
-CharsetResult
-charset_to_ucase_utf8(CharsetTranslation *t,
-		      const unsigned char *src, size_t *src_size, Buffer *dest);
+enum charset_result
+charset_to_ucase_utf8(struct charset_translation *t,
+		      const unsigned char *src, size_t *src_size,
+		      buffer_t *dest);
 
 /* Simple wrappers for above functions. If utf8_size is non-NULL, it's set
    to same as strlen(returned data). */
@@ -36,7 +35,7 @@
 			     size_t *utf8_size_r);
 
 void _charset_utf8_ucase(const unsigned char *src, size_t src_size,
-			 Buffer *dest, size_t destpos);
+			 buffer_t *dest, size_t destpos);
 const char *_charset_utf8_ucase_strdup(const unsigned char *data, size_t size,
 				       size_t *utf8_size_r);