Avoid some silly compiler warnings, and add the change log I forgot :-)

diff --git a/CHANGES b/CHANGES
index 90a876f2c309f691bb9ca33e6fd24b43aeea6ff9..2915d239209fa2b2139303b11927b29ca46923df 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,12 @@
 
  Changes between 0.9.4 and 0.9.5  [xx XXX 1999]
 
+  *) Add the possibility to add extra information to the memory leak
+     detecting output, to form tracebacks, showing from where each
+     allocation was originated.  Also updated sid code to be multi-
+     thread-safe.
+     [Richard Levitte]
+
   *) Add options -text and -noout to pkcs7 utility and delets the
      encryption options which never did anything. Update docs.
      [Steve Henson]

diff --git a/crypto/mem.c b/crypto/mem.c
index 5e728e38529c92ff89b770a088739217e1820c46..ddcc1113d52e4f05dff9bb45915e66bdea16ed74 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -244,7 +244,7 @@ static APP_INFO *remove_info()
 #ifdef LEVITTE_DEBUG
                        if (ret->thread != tmp.thread)
                                {
-                               fprintf(stderr, "remove_info(): deleted info has other thread ID (%d) than the current thread (%d)!!!!\n",
+                               fprintf(stderr, "remove_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
                                        ret->thread, tmp.thread);
                                abort();
                                }
@@ -295,7 +295,7 @@ int CRYPTO_add_info(const char *file, int line, const char *info)
 #ifdef LEVITTE_DEBUG
                        if (ami->thread != amim->thread)
                                {
-                               fprintf(stderr, "CRYPTO_add_info(): previous info has other thread ID (%d) than the current thread (%d)!!!!\n",
+                               fprintf(stderr, "CRYPTO_add_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
                                        amim->thread, ami->thread);
                                abort();
                                }
@@ -581,7 +581,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
                ami_cnt++;
                memset(buf,'>',ami_cnt);
                sprintf(buf + ami_cnt,
-                       "thread=%d, file=%s, line=%d, info=\"",
+                       "thread=%lu, file=%s, line=%d, info=\"",
                        amip->thread, amip->file, amip->line);
                buf_len=strlen(buf);
                info_len=strlen(amip->info);