From afed9ddfa92b5469dae742c6f7b9ae7628c963c0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 28 Mar 2006 16:18:18 +0000 Subject: [PATCH] 2006-03-28 [colin] 2.0.0cvs179 * src/common/smtp.c * src/common/passcrypt.c * src/undo.c Warning fixes. Patch by Pawel Pekala --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/passcrypt.c | 13 +++++++------ src/common/smtp.c | 4 ++++ src/undo.c | 2 -- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fbdeb28b..94127a8cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-28 [colin] 2.0.0cvs179 + + * src/common/smtp.c + * src/common/passcrypt.c + * src/undo.c + Warning fixes. Patch by Pawel Pekala + 2006-03-27 [colin] 2.0.0cvs178 * src/undo.c diff --git a/PATCHSETS b/PATCHSETS index d68d6dfd8..45e162906 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1364,3 +1364,4 @@ ( cvs diff -u -r 1.395.2.188 -r 1.395.2.189 src/summaryview.c; ) > 2.0.0cvs176.patchset ( cvs diff -u -r 1.96.2.104 -r 1.96.2.105 src/textview.c; ) > 2.0.0cvs177.patchset ( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/undo.c; ) > 2.0.0cvs178.patchset +( cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/common/smtp.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/passcrypt.c; cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/undo.c; ) > 2.0.0cvs179.patchset diff --git a/configure.ac b/configure.ac index cf475289a..43965541b 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=178 +EXTRA_VERSION=179 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c index 01851ccd9..9e809b916 100644 --- a/src/common/passcrypt.c +++ b/src/common/passcrypt.c @@ -36,11 +36,6 @@ void crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len, unsigned chunksize, int decrypt); -static void crypt_cfb_shift(unsigned char *to, - const unsigned char *from, unsigned len); -static void crypt_cfb_xor(unsigned char *to, const unsigned char *from, - unsigned len); -static void crypt_unpack(unsigned char *a); void passcrypt_encrypt(gchar *password, guint len) { @@ -73,6 +68,12 @@ crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len, ecb_crypt(des_key, buf, len, DES_ENCRYPT); } #else +static void crypt_cfb_shift(unsigned char *to, + const unsigned char *from, unsigned len); +static void crypt_cfb_xor(unsigned char *to, const unsigned char *from, + unsigned len); +static void crypt_unpack(unsigned char *a); + void crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len, unsigned chunksize, int decrypt) @@ -103,7 +104,6 @@ crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len, buf += chunksize; } } -#endif /* * Shift len bytes from end of to buffer to beginning, then put len @@ -164,3 +164,4 @@ static void crypt_unpack(unsigned char *a) for (j = 7; j >= 0; --j) a[(i << 3) + j] = (a[i] & (0x80 >> j)) != 0; } +#endif diff --git a/src/common/smtp.c b/src/common/smtp.c index 7c2f0d9a1..653b4d5db 100644 --- a/src/common/smtp.c +++ b/src/common/smtp.c @@ -40,7 +40,9 @@ static void smtp_session_destroy(Session *session); static gint smtp_auth(SMTPSession *session); +#if USE_OPENSSL static gint smtp_starttls(SMTPSession *session); +#endif static gint smtp_auth_cram_md5(SMTPSession *session); static gint smtp_auth_login(SMTPSession *session); static gint smtp_auth_plain(SMTPSession *session); @@ -328,6 +330,7 @@ static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg) return SM_ERROR; } +#if USE_OPENSSL static gint smtp_starttls(SMTPSession *session) { session->state = SMTP_STARTTLS; @@ -338,6 +341,7 @@ static gint smtp_starttls(SMTPSession *session) return SM_OK; } +#endif static gint smtp_auth_cram_md5(SMTPSession *session) { diff --git a/src/undo.c b/src/undo.c index 9ce75e981..2676d72df 100644 --- a/src/undo.c +++ b/src/undo.c @@ -233,8 +233,6 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos, } if (action == UNDO_ACTION_DELETE) { - gboolean checkit = TRUE; - if (last_undo->start_pos != end_pos && last_undo->start_pos != start_pos) { last_undo->mergeable = FALSE; -- 2.25.1