fixed minor compiler warnings. same. same. same. same. same.

2002-03-15  Charles Kerr <charles@rebelbase.com>

	* gmime-filter-charset.c: fixed minor compiler warnings.
	* gmime-iconv-utils.c: same.
	* test-html.c: same.
	* test-iconv.c: same.
	* test-mime.c: same.
	* test-streams.c: same.

13 files changed, 31 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 521948c9..5389cb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-15  Charles Kerr <charles@rebelbase.com>
+
+	* gmime-filter-charset.c: fixed minor compiler warnings.
+	* gmime-iconv-utils.c: same.
+	* test-html.c: same.
+	* test-iconv.c: same.
+	* test-mime.c: same.
+	* test-streams.c: same.
+
 2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* gmime-utils.c (g_mime_utils_uudecode_step): Fixed a logic
diff --git a/gmime-filter-charset.c b/gmime-filter-charset.c
index f687ef39..2ab323d2 100644
--- a/gmime-filter-charset.c
+++ b/gmime-filter-charset.c
@@ -109,7 +109,7 @@ filter_filter (GMimeFilter *filter, char *in, size_t len, size_t prespace,
 {
 	GMimeFilterCharset *charset = (GMimeFilterCharset *) filter;
 	size_t inleft, outleft, converted = 0;
-	const char *inbuf;
+	char *inbuf;
 	char *outbuf;
 	
 	if (charset->cd == (iconv_t) -1)
@@ -173,7 +173,7 @@ filter_complete (GMimeFilter *filter, char *in, size_t len, size_t prespace,
 {
 	GMimeFilterCharset *charset = (GMimeFilterCharset *) filter;
 	size_t inleft, outleft, converted = 0;
-	const char *inbuf;
+	char *inbuf;
 	char *outbuf;
 	
 	if (charset->cd == (iconv_t) -1)
diff --git a/gmime-iconv-utils.c b/gmime-iconv-utils.c
index 7c46d5fb..48b6e102 100644
--- a/gmime-iconv-utils.c
+++ b/gmime-iconv-utils.c
@@ -89,7 +89,7 @@ g_mime_iconv_strndup (iconv_t cd, const char *string, size_t n)
 		outbuf = out + converted;
 		outleft = outlen - converted;
 		
-		converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
+		converted = iconv (cd, (char**)&inbuf, &inleft, &outbuf, &outleft);
 		if (converted == (size_t) -1) {
 			if (errno != E2BIG && errno != EINVAL)
 				goto fail;
diff --git a/gmime/gmime-filter-charset.c b/gmime/gmime-filter-charset.c
index f687ef39..2ab323d2 100644
--- a/gmime/gmime-filter-charset.c
+++ b/gmime/gmime-filter-charset.c
@@ -109,7 +109,7 @@ filter_filter (GMimeFilter *filter, char *in, size_t len, size_t prespace,
 {
 	GMimeFilterCharset *charset = (GMimeFilterCharset *) filter;
 	size_t inleft, outleft, converted = 0;
-	const char *inbuf;
+	char *inbuf;
 	char *outbuf;
 	
 	if (charset->cd == (iconv_t) -1)
@@ -173,7 +173,7 @@ filter_complete (GMimeFilter *filter, char *in, size_t len, size_t prespace,
 {
 	GMimeFilterCharset *charset = (GMimeFilterCharset *) filter;
 	size_t inleft, outleft, converted = 0;
-	const char *inbuf;
+	char *inbuf;
 	char *outbuf;
 	
 	if (charset->cd == (iconv_t) -1)
diff --git a/gmime/gmime-iconv-utils.c b/gmime/gmime-iconv-utils.c
index 7c46d5fb..48b6e102 100644
--- a/gmime/gmime-iconv-utils.c
+++ b/gmime/gmime-iconv-utils.c
@@ -89,7 +89,7 @@ g_mime_iconv_strndup (iconv_t cd, const char *string, size_t n)
 		outbuf = out + converted;
 		outleft = outlen - converted;
 		
-		converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
+		converted = iconv (cd, (char**)&inbuf, &inleft, &outbuf, &outleft);
 		if (converted == (size_t) -1) {
 			if (errno != E2BIG && errno != EINVAL)
 				goto fail;
diff --git a/test-html.c b/test-html.c
index 913fe0db..c39d8cfe 100644
--- a/test-html.c
+++ b/test-html.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <string.h>
 
 #include "gmime.h"
 #include "gmime-filter-html.h"
diff --git a/test-iconv.c b/test-iconv.c
index e20a7cbe..cda9aa7c 100644
--- a/test-iconv.c
+++ b/test-iconv.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "gmime-iconv.h"
 #include "gmime-iconv-utils.h"
 
@@ -62,6 +63,7 @@ static char *charsets[] = {
 static int num_charsets = sizeof (charsets) / sizeof (charsets[0]);
 
 
+#if 0
 static void
 test_cache (void)
 {
@@ -102,6 +104,7 @@ test_cache (void)
 	
 	g_slist_free (open_cds);
 }
+#endif
 
 
 struct {
@@ -192,4 +195,5 @@ int main (int argc, char **argv)
 	/*test_cache ();*/
 	
 	test_utils ();
+	return 0;
 }
diff --git a/test-mime.c b/test-mime.c
index a6d63a17..ae24227b 100644
--- a/test-mime.c
+++ b/test-mime.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <glib.h>
 
 #include "gmime.h"
diff --git a/test-streams.c b/test-streams.c
index fb97b219..0859bedd 100644
--- a/test-streams.c
+++ b/test-streams.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 static GSList *test = NULL;
 
@@ -39,7 +40,7 @@ test_abort (void)
 	fprintf (stderr, "stream tests failed while in:\n\t");
 	n = test;
 	while (n) {
-		fprintf (stderr, "%s", n->data);
+		fprintf (stderr, "%s", (char*)n->data);
 		if (n->next)
 			fprintf (stderr, ": ");
 		n = n->next;
diff --git a/tests/test-html.c b/tests/test-html.c
index 913fe0db..c39d8cfe 100644
--- a/tests/test-html.c
+++ b/tests/test-html.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <string.h>
 
 #include "gmime.h"
 #include "gmime-filter-html.h"
diff --git a/tests/test-iconv.c b/tests/test-iconv.c
index e20a7cbe..cda9aa7c 100644
--- a/tests/test-iconv.c
+++ b/tests/test-iconv.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "gmime-iconv.h"
 #include "gmime-iconv-utils.h"
 
@@ -62,6 +63,7 @@ static char *charsets[] = {
 static int num_charsets = sizeof (charsets) / sizeof (charsets[0]);
 
 
+#if 0
 static void
 test_cache (void)
 {
@@ -102,6 +104,7 @@ test_cache (void)
 	
 	g_slist_free (open_cds);
 }
+#endif
 
 
 struct {
@@ -192,4 +195,5 @@ int main (int argc, char **argv)
 	/*test_cache ();*/
 	
 	test_utils ();
+	return 0;
 }
diff --git a/tests/test-mime.c b/tests/test-mime.c
index a6d63a17..ae24227b 100644
--- a/tests/test-mime.c
+++ b/tests/test-mime.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <glib.h>
 
 #include "gmime.h"
diff --git a/tests/test-streams.c b/tests/test-streams.c
index fb97b219..0859bedd 100644
--- a/tests/test-streams.c
+++ b/tests/test-streams.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 static GSList *test = NULL;
 
@@ -39,7 +40,7 @@ test_abort (void)
 	fprintf (stderr, "stream tests failed while in:\n\t");
 	n = test;
 	while (n) {
-		fprintf (stderr, "%s", n->data);
+		fprintf (stderr, "%s", (char*)n->data);
 		if (n->next)
 			fprintf (stderr, ": ");
 		n = n->next;