libgcrypt/src (ChangeLog secmem.c secmem.h sexp.c)

[cvs user wk]

    Date: Tuesday, October 12, 2004 @ 10:55:42
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt/src

Modified: ChangeLog secmem.c secmem.h sexp.c

* sexp.c (sexp_sscan): Removed C++ style comments.  Noted by Yoann
Vandoorselaere.
* secmem.h (_gcry_secmem_set_flags,_gcry_secmem_get_flags):
Removed __pure__.
(GCRY_SECMEM_FLAG_NO_WARNING): Put macro value into parens.


-----------+
 ChangeLog |   13 +++++++++++++
 secmem.c  |    2 +-
 secmem.h  |    8 ++++----
 sexp.c    |    2 --
 4 files changed, 18 insertions(+), 7 deletions(-)


Index: libgcrypt/src/ChangeLog
diff -u libgcrypt/src/ChangeLog:1.156 libgcrypt/src/ChangeLog:1.157
--- libgcrypt/src/ChangeLog:1.156	Mon Aug 23 15:34:51 2004
+++ libgcrypt/src/ChangeLog	Tue Oct 12 10:55:42 2004
@@ -1,3 +1,8 @@
+2004-09-21  Werner Koch  <wk at g10code.de>
+
+	* sexp.c (sexp_sscan): Removed C++ style comments.  Noted by Yoann
+	Vandoorselaere.
+
 2004-08-23  Moritz Schulte  <moritz at g10code.com>
 
 	* global.c: Do not include <assert.h>. 
@@ -10,6 +15,14 @@
 	* secmem.c (_gcry_secmem_init): Try to lock pool into core not
 	only when running with root privileges.
 
+2004-08-16  Werner Koch  <wk at g10code.de>
+
+	* secmem.h (_gcry_secmem_set_flags,_gcry_secmem_get_flags):
+	Removed __pure__.
+	(GCRY_SECMEM_FLAG_NO_WARNING): Put macro value into parens.
+
+	* secmem.c (_gcry_secmem_init): Defer printing of the warning.
+
 2004-08-10  Moritz Schulte  <moritz at g10code.com>
 
 	* gcrypt.h: Include <sys/time.h>, thanks to Simon Josefsson.
Index: libgcrypt/src/secmem.c
diff -u libgcrypt/src/secmem.c:1.24 libgcrypt/src/secmem.c:1.25
--- libgcrypt/src/secmem.c:1.24	Sun Aug 22 10:49:31 2004
+++ libgcrypt/src/secmem.c	Tue Oct 12 10:55:42 2004
@@ -453,7 +453,7 @@
     {
       if (n < DEFAULT_POOL_SIZE)
 	n = DEFAULT_POOL_SIZE;
-      if (! pool_okay)
+      if (!pool_okay)
 	{
 	  init_pool (n);
 	  lock_pool (pool, n);
Index: libgcrypt/src/secmem.h
diff -u libgcrypt/src/secmem.h:1.8 libgcrypt/src/secmem.h:1.9
--- libgcrypt/src/secmem.h:1.8	Mon Jun  9 15:47:04 2003
+++ libgcrypt/src/secmem.h	Tue Oct 12 10:55:42 2004
@@ -28,11 +28,11 @@
 void _gcry_secmem_free (void *a);
 void _gcry_secmem_dump_stats (void);
 void _gcry_secmem_set_flags (unsigned flags);
-unsigned _gcry_secmem_get_flags(void) GCC_ATTR_PURE;
-int _gcry_private_is_secure (const void *p) GCC_ATTR_PURE;
+unsigned _gcry_secmem_get_flags(void);
+int _gcry_private_is_secure (const void *p);
 
 /* Flags for _gcry_secmem_{set,get}_flags.  */
-#define GCRY_SECMEM_FLAG_NO_WARNING      1 << 0
-#define GCRY_SECMEM_FLAG_SUSPEND_WARNING 1 << 1
+#define GCRY_SECMEM_FLAG_NO_WARNING      (1 << 0)
+#define GCRY_SECMEM_FLAG_SUSPEND_WARNING (1 << 1)
 
 #endif /* G10_SECMEM_H */
Index: libgcrypt/src/sexp.c
diff -u libgcrypt/src/sexp.c:1.41 libgcrypt/src/sexp.c:1.42
--- libgcrypt/src/sexp.c:1.41	Mon Aug 23 15:34:51 2004
+++ libgcrypt/src/sexp.c	Tue Oct 12 10:55:42 2004
@@ -972,7 +972,6 @@
 		      *erroff = p - buffer;
 		      /* Invalid octal value.  */
 		      err = GPG_ERR_SEXP_BAD_QUOTATION;
-		      //return gcry_error (GPG_ERR_SEXP_BAD_QUOTATION);
 		    }
 		  p += 2;
 		  n -= 2;
@@ -985,7 +984,6 @@
 		      *erroff = p - buffer;
 		      /* Invalid hex value.  */
 		      err = GPG_ERR_SEXP_BAD_QUOTATION;
-		      //return gcry_error (GPG_ERR_SEXP_BAD_QUOTATION);
 		    }
 		  p += 2;
 		  n -= 2;