Andrew redefines the free() function to do some memory management testing.

He also suggested that some systems may implement free() as a macro (but
I think he was looking for an excuse ;).  Anyway, I've added a function
to mangle.c that calls free().
Chris -)-----
(This used to be commit 95f7b03285c42e8f5573690939b79afc7e686908)

1 files changed, 19 insertions, 1 deletions

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 3953da54ea..eb267faab3 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -473,6 +473,24 @@ static signed int cache_compare( ubi_btItemPtr ItemPtr, ubi_btNodePtr NodePtr )
   } /* cache_compare */
 
 /* ************************************************************************** **
+ * Free a cache entry.
+ *
+ *  Input:  WarrenZevon - Pointer to the entry that is to be returned to
+ *                        Nirvana.
+ *  Output: none.
+ *
+ *  Notes:  This function gets around the possibility that the standard
+ *          free() function may be implemented as a macro, or other evil
+ *          subversions (oh, so much fun).
+ *
+ * ************************************************************************** **
+ */
+static void cache_free_entry( ubi_trNodePtr WarrenZevon )
+  {
+  free( WarrenZevon );
+  } /* cache_free_entry */
+
+/* ************************************************************************** **
  * Initializes or clears the mangled cache.
  *
  *  Input:  none.
@@ -494,7 +512,7 @@ void reset_mangled_cache( void )
     {
     (void)ubi_cacheInit( mangled_cache,
                          cache_compare,
-                         (ubi_trKillNodeRtn)free,
+                         cache_free_entry,
                          MANGLED_CACHE_MAX_ENTRIES,
                          MANGLED_CACHE_MAX_MEMORY );
     mc_initialized = True;