Fixed compiler warnings.

2002-06-14  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-arg.c:
	* camel-disco-diary.c:
	* camel-index-control.c:
	* camel-mime-part.c:
	* camel-pgp-mime.c:
	* camel-store.c:
	* camel-tcp-stream-ssl.c:
	* camel-text-index.c: Fixed compiler warnings.

svn path=/trunk/; revision=17187

10 files changed, 31 insertions, 15 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 05f518984c..221a5d9cc0 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,14 @@
 2002-06-14  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* camel-arg.c:
+	* camel-disco-diary.c:
+	* camel-index-control.c:
+	* camel-mime-part.c:
+	* camel-pgp-mime.c:
+	* camel-store.c:
+	* camel-tcp-stream-ssl.c:
+	* camel-text-index.c: Fixed compiler warnings.
+
 	* camel-multipart-signed.c: Updated to use ctx->sign_protocol
 	rather than ctx->protocol.
 
diff --git a/camel/camel-arg.c b/camel/camel-arg.c
index d642fb751a..f8cd048f0a 100644
--- a/camel/camel-arg.c
+++ b/camel/camel-arg.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include "camel-arg.h"
 
 int camel_argv_build(CamelArgV *tv)
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 8c41f2a098..d59f8b1004 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -25,6 +25,10 @@
 #include <config.h>
 #endif
 
+#define __USE_LARGEFILE 1
+#include <stdio.h>
+#include <errno.h>
+
 #include "camel-disco-diary.h"
 #include "camel-disco-folder.h"
 #include "camel-disco-store.h"
@@ -35,8 +39,6 @@
 #include "camel-session.h"
 #include "camel-store.h"
 
-#include <errno.h>
-
 
 static void
 camel_disco_diary_class_init (CamelDiscoDiaryClass *camel_disco_diary_class)
diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c
index f1f4dd234d..335f8cc3b1 100644
--- a/camel/camel-index-control.c
+++ b/camel/camel-index-control.c
@@ -71,7 +71,7 @@ do_dump(int argc, char **argv)
 		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
 		if (idx) {
 			printf(" Dumping ...\n");
-			camel_text_index_dump(idx);
+			camel_text_index_dump((CamelTextIndex *)idx);
 			camel_object_unref((CamelObject *)idx);
 		} else {
 			printf(" Failed: %s\n", strerror(errno));
@@ -91,7 +91,7 @@ do_info(int argc, char **argv)
 		printf("Opening index file: %s\n", argv[i]);
 		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
 		if (idx) {
-			camel_text_index_info(idx);
+			camel_text_index_info((CamelTextIndex *)idx);
 			camel_object_unref((CamelObject *)idx);
 		} else {
 			printf(" Failed: %s\n", strerror(errno));
@@ -111,7 +111,7 @@ do_check(int argc, char **argv)
 		printf("Opening index file: %s\n", argv[i]);
 		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);
 		if (idx) {
-			camel_text_index_validate(idx);
+			camel_text_index_validate((CamelTextIndex *)idx);
 			camel_object_unref((CamelObject *)idx);
 		} else {
 			printf(" Failed: %s\n", strerror(errno));
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index e64fc94927..3ebd45e6aa 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -94,7 +94,7 @@ static void set_disposition (CamelMimePart *mime_part, const gchar *disposition)
 
 /* format output of headers */
 static int write_references(CamelStream *stream, struct _header_raw *h);
-static int write_fold(CamelStream *stream, struct _header_raw *h);
+/*static int write_fold(CamelStream *stream, struct _header_raw *h);*/
 static int write_raw(CamelStream *stream, struct _header_raw *h);
 
 
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index b16232c085..b0e3ab379e 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -299,8 +299,8 @@ camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, c
 	/* reset the stream */
 	camel_stream_reset (stream);
 	
-	printf ("attempting to sign data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
-		CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data);
+	d(printf ("attempting to sign data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
+		  CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data));
 	
 	/* construct the signature stream */
 	sigstream = camel_stream_mem_new ();
@@ -439,8 +439,8 @@ camel_pgp_mime_part_verify (CamelPgpContext *context, CamelMimePart *mime_part,
 	/* verify */
 	valid = camel_pgp_verify (context, stream, sigstream, ex);
 	
-	printf ("attempted to verify data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
-		CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data);
+	d(printf ("attempted to verify data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",
+		  CAMEL_STREAM_MEM (stream)->buffer->len, CAMEL_STREAM_MEM (stream)->buffer->data));
 	
 	camel_object_unref (CAMEL_OBJECT (sigstream));
 	camel_object_unref (CAMEL_OBJECT (stream));
diff --git a/camel/camel-store.c b/camel/camel-store.c
index ab3d667fde..149c591575 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -27,8 +27,8 @@
 #include <config.h>
 #endif
 
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <string.h>
 
 #include "camel-session.h"
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index eb299a91bb..6419cbf4e2 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -57,6 +57,10 @@
 #include "camel-session.h"
 
 
+/* from md5-utils.h */
+void md5_get_digest (const char *buffer, int buffer_size, unsigned char digest[16]);
+
+
 static CamelTcpStreamClass *parent_class = NULL;
 
 /* Returns the class for a CamelTcpStreamSSL */
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index ab2ec72661..8a5ab05bf6 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -65,10 +65,6 @@
 
 static int text_index_compress_nosync(CamelIndex *idx);
 
-void camel_text_index_dump(CamelTextIndex *idx);
-void camel_text_index_info(CamelTextIndex *idx);
-void camel_text_index_validate(CamelTextIndex *idx);
-
 /* ********************************************************************** */
 
 /* "private" data, shared between index/cursor/name classes */
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index de2a5252ec..09b8fc0db7 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -105,5 +105,9 @@ int camel_text_index_check(const char *path);
 int camel_text_index_rename(const char *old, const char *new);
 int camel_text_index_remove(const char *old);
 
+void camel_text_index_dump(CamelTextIndex *idx);
+void camel_text_index_info(CamelTextIndex *idx);
+void camel_text_index_validate(CamelTextIndex *idx);
+
 #endif /* ! _CAMEL_TEXT_INDEX_H */