2008-11-11 [colin] 3.6.1cvs21

	* src/autofaces.c
	* src/common/md5.c
	* src/common/md5.h
		Make a few functions static

diff --git a/ChangeLog b/ChangeLog
index 0e0c48ad19aeadfd87b9a5eddff73a186d8c76e6..e8e3ef633430c87d606154e72eab8edaf0f4615a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-11 [colin]     3.6.1cvs21
+
+       * src/autofaces.c
+       * src/common/md5.c
+       * src/common/md5.h
+               Make a few functions static
+
 2008-11-07 [colin]     3.6.1cvs20
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index cd2ea04264a47994a1a20085ca76b23894e41f5a..823aa7aabf8ede6e302c03f1837e5b0ce3606ab5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3602,3 +3602,4 @@
 ( cvs diff -u -r 1.12.2.54 -r 1.12.2.55 src/action.c;  cvs diff -u -r 1.115.2.214 -r 1.115.2.215 src/main.c;  cvs diff -u -r 1.274.2.287 -r 1.274.2.288 src/mainwindow.c;  cvs diff -u -r 1.13.2.40 -r 1.13.2.41 src/common/socket.c;  cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/common/socket.h;  cvs diff -u -r 1.5.2.84 -r 1.5.2.85 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.46 -r 1.4.2.47 src/gtk/gtkutils.h;  ) > 3.6.1cvs18.patchset
 ( cvs diff -u -r 1.274.2.288 -r 1.274.2.289 src/mainwindow.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 tools/claws.i18n.status.pl;  ) > 3.6.1cvs19.patchset
 ( cvs diff -u -r 1.5.10.26 -r 1.5.10.27 src/addrgather.c;  cvs diff -u -r 1.8.2.32 -r 1.8.2.33 src/editldap.c;  cvs diff -u -r 1.274.2.289 -r 1.274.2.290 src/mainwindow.c;  cvs diff -u -r 1.105.2.147 -r 1.105.2.148 src/prefs_account.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_logging.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/prefs_message.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_other.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_receive.c;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_wrapping.c;  cvs diff -u -r 1.395.2.397 -r 1.395.2.398 src/summaryview.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.51 -r 1.23.2.52 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.6.1cvs20.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/autofaces.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/md5.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/md5.h;  ) > 3.6.1cvs21.patchset

diff --git a/configure.ac b/configure.ac
index edb4b5924366de87bf3707ce24f918287d63fea2..067faf50725dae269c47aeaf9f1f634a20b09f3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/autofaces.c b/src/autofaces.c
index d7529de57bd33d310b410a56709c523046e89733..db3e189d577c51f709d97c9ece701c2a72f522aa 100644 (file)
--- a/src/autofaces.c
+++ b/src/autofaces.c
@@ -27,7 +27,7 @@
 #include "utils.h"
 #include "autofaces.h"
 
-gint get_content_for_any_face(gchar *buf, gint len, gchar *anyname, gint maxlen)
+static gint get_content_for_any_face(gchar *buf, gint len, gchar *anyname, gint maxlen)
 {
        FILE  *xfp;
        gchar *xfile;
@@ -55,7 +55,7 @@ gint get_content_for_any_face(gchar *buf, gint len, gchar *anyname, gint maxlen)
        return 0;
 }
 
-gchar * get_any_face_filename_for_account(gchar *facetype, gchar *accountname)
+static gchar * get_any_face_filename_for_account(gchar *facetype, gchar *accountname)
 {
        gchar *name = NULL;
        gchar *what = NULL;

diff --git a/src/common/md5.c b/src/common/md5.c
index 1c50302a9db49a57e0fe38cbf4498134366fd7bd..d70bfc3ca44b1f1f36e1276d10bf51d01642a400 100644 (file)
--- a/src/common/md5.c
+++ b/src/common/md5.c
@@ -331,7 +331,7 @@ md5_final(unsigned char *digest, MD5_CONTEXT *ctx)
  * Creates a MD5 digest in hex fomrat (lowercase letters) from the
  * string S.  hextdigest but be buffer of at lease 33 bytes!
  */
-void
+static void
 md5_hex_digest_binary(char *hexdigest, const unsigned char *s, size_t len)
 {
        int i;

diff --git a/src/common/md5.h b/src/common/md5.h
index 1413c015372b53ccabf15a588ac459b954335fd9..90cc63a56beacc61aa7bc60333bad7e26d66cba8 100644 (file)
--- a/src/common/md5.h
+++ b/src/common/md5.h
@@ -32,7 +32,6 @@ typedef struct {  /* Hmm, should be private */
 } MD5_CONTEXT;
 
 void md5_hex_digest(char *hexdigest, const unsigned char *s);
-void md5_hex_digest_binary(char *hexdigest, const unsigned char *s, size_t len);
 int md5_hex_digest_file(char *hexdigest, const unsigned char *file);
 void md5_hex_hmac(char *hexdigest,
                   const unsigned char* text, int text_len,