diff options
| -rw-r--r-- | camel/ChangeLog | 18 | ||||
| -rw-r--r-- | camel/camel-charset-map.c | 11 | ||||
| -rw-r--r-- | camel/camel.h | 1 | ||||
| -rw-r--r-- | camel/providers/nntp/camel-nntp-grouplist.c | 6 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 4 | ||||
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 1 |
6 files changed, 29 insertions, 12 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 41c4454c7b..368e27b466 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,21 @@ +2000-10-29 Dan Winship <danw@helixcode.com> + + * camel.h: Remove md5-utils.h include since it's not part of Camel + any more. + + * camel-charset-map.c: Kill some warnings. + + * providers/nntp/camel-nntp-grouplist.c + (camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save): + Clean up warnings about time_t casts. + + * providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h + include. + + * providers/pop3/camel-pop3-store.c: Undefine the "_" macro + defined by krb4's des.h when compiling with krb support. + Fix md5-utils.h include. + 2000-10-27 Dan Winship <danw@helixcode.com> * camel-mime-utils.c (header_param_list_format_append): Only quote diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c index b6ad0a5f37..ddc8f0a896 100644 --- a/camel/camel-charset-map.c +++ b/camel/camel-charset-map.c @@ -214,7 +214,6 @@ camel_charset_best_mask(unsigned int mask) const char * camel_charset_best(const char *in, int len) { - int i; unsigned int mask = ~0; int level = 0; const char *inptr = in, *inend = in+len; @@ -242,14 +241,12 @@ camel_charset_best(const char *in, int len) } } - switch(level) { - case 0: - return NULL; - case 1: + if (level == 1) return "ISO-8859-1"; - case 2: + else if (level == 2) return camel_charset_best_mask(mask); - } + else + return NULL; } diff --git a/camel/camel.h b/camel/camel.h index 752b145b49..fefadafb18 100644 --- a/camel/camel.h +++ b/camel/camel.h @@ -67,7 +67,6 @@ extern "C" { #include <camel/gmime-content-field.h> #include <camel/gstring-util.h> #include <camel/hash-table-utils.h> -#include <camel/md5-utils.h> #include <camel/string-utils.h> gint camel_init (void); diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c index 98aac2a03b..d7ee85d182 100644 --- a/camel/providers/nntp/camel-nntp-grouplist.c +++ b/camel/providers/nntp/camel-nntp-grouplist.c @@ -83,6 +83,7 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex) CamelNNTPGroupList *list; FILE *fp; char buf[300]; + unsigned long time; g_free (root_dir); fp = fopen (grouplist_file, "r"); @@ -109,7 +110,8 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex) list = g_new0 (CamelNNTPGroupList, 1); list->store = store; - sscanf (buf, "%d", &list->time); + sscanf (buf, "%lu", &time); + list->time = time; while (fgets (buf, 300, fp)) { CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1); @@ -154,7 +156,7 @@ camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex) return; } - fprintf (fp, "%d\n", group_list->time); /* XXX */ + fprintf (fp, "%lu\n", (long)group_list->time); g_list_foreach (group_list->group_list, (GFunc)save_entry, fp); diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index 54b5e0dea3..4932974c16 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -40,6 +40,8 @@ #define KPOP_PORT 1109 #include <krb.h> +/* MIT krb4 des.h #defines _. Sigh. We don't need it. */ +#undef _ #ifdef NEED_KRB_SENDAUTH_PROTO extern int krb_sendauth(long options, int fd, KTEXT ticket, char *service, @@ -57,7 +59,7 @@ extern int krb_sendauth(long options, int fd, KTEXT ticket, char *service, #include "camel-session.h" #include "camel-exception.h" #include "camel-url.h" -#include "md5-utils.h" +#include "e-util/md5-utils.h" /* Specified in RFC 1939 */ #define POP3_PORT 110 diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 2aae484c88..91693bd1f7 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -48,7 +48,6 @@ #include "camel-stream-fs.h" #include "camel-session.h" #include "camel-exception.h" -#include "md5-utils.h" #define d(x) x |