gnome-keyring r1558 - in trunk: . egg

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Feb 13 04:20:28 2009
New Revision: 1558
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1558&view=rev

Log:
Remove FORCE_MALLOC_MEMORY define.

It seems we can accomplish the identical goal with FORCE_FALLBACK_MEMORY.

Modified:
   trunk/ChangeLog
   trunk/egg/egg-secure-memory.c

Modified: trunk/egg/egg-secure-memory.c
==============================================================================
--- trunk/egg/egg-secure-memory.c	(original)
+++ trunk/egg/egg-secure-memory.c	Fri Feb 13 04:20:28 2009
@@ -45,7 +45,6 @@
  * Use this to force all memory through malloc
  * for use with valgrind and the like 
  */
-#define FORCE_MALLOC_MEMORY 0
 #define FORCE_FALLBACK_MEMORY 0
 
 #define DEBUG_SECURE_MEMORY 0
@@ -415,13 +414,7 @@
 	pgsize = getpagesize ();
 	*sz = (*sz + pgsize -1) & ~(pgsize - 1);
 	
-#if FORCE_MALLOC_MEMORY
-	pages = malloc (*sz);
-	memset (pages, 0, *sz);
-	lock_warning = 1;
-	return pages;
-	
-#elif defined(HAVE_MLOCK)
+#if defined(HAVE_MLOCK)
 	pages = mmap (0, *sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
 	if (pages == MAP_FAILED) {
 		if (lock_warning)
@@ -461,10 +454,7 @@
 	ASSERT (pages);
 	ASSERT (sz % getpagesize () == 0);
 	
-#if FORCE_MALLOC_MEMORY
-	free (pages);
-	
-#elif defined(HAVE_MLOCK)
+#if defined(HAVE_MLOCK)
 	if (munlock (pages, sz) < 0)
 		fprintf (stderr, "couldn't unlock private memory: %s\n", strerror (errno));