Changeset 228 for branches/samba-3.2.x/source/lib/memcache.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/lib/memcache.c (modified) (3 diffs)

branches/samba-3.2.x/source/lib/memcache.c

@@ -215 +215 @@
         DLIST_REMOVE(cache->mru, e);
 
+        if (memcache_is_talloc(e->n)) {
+                DATA_BLOB cache_key, cache_value;
+                void *ptr;
+
+                memcache_element_parse(e, &cache_key, &cache_value);
+                SMB_ASSERT(cache_value.length == sizeof(ptr));
+                memcpy(&ptr, cache_value.data, sizeof(ptr));
+                TALLOC_FREE(ptr);
+        }
+
         cache->size -= memcache_element_size(e->keylength, e->valuelength);
 
@@ -277 +287 @@
 
                 if (value.length <= cache_value.length) {
+                        if (memcache_is_talloc(e->n)) {
+                                void *ptr;
+                                SMB_ASSERT(cache_value.length == sizeof(ptr));
+                                memcpy(&ptr, cache_value.data, sizeof(ptr));
+                                TALLOC_FREE(ptr);
+                        }
                         /*
                          * We can reuse the existing record
@@ -333 +349 @@
 
 void memcache_add_talloc(struct memcache *cache, enum memcache_number n,
-                         DATA_BLOB key, void *ptr)
-{
-        memcache_add(cache, n, key, data_blob_const(&ptr, sizeof(ptr)));
+                         DATA_BLOB key, void *pptr)
+{
+        void **ptr = (void **)pptr;
+        void *p;
+
+        if (cache == NULL) {
+                cache = global_cache;
+        }
+        if (cache == NULL) {
+                return;
+        }
+
+        p = talloc_move(cache, ptr);
+        memcache_add(cache, n, key, data_blob_const(&p, sizeof(p)));
 }