Changeset 1363 in MondoRescue

Timestamp:

Apr 30, 2007, 12:28:55 AM (18 years ago)

Author:

Bruno Cornec

Message:

Update for the mr_list structure to have a pointer on function to remove data allocated in the structure mr_list_elt in the data field.

Location:

branches/stable/mondo/src

Files:

• include/mr_list.h (modified) (2 diffs)
• lib/mr_list.c (modified) (2 diffs)

branches/stable/mondo/src/include/mr_list.h

@@ -23 +23 @@
     void *data;
 
+    /* Function to unallocate memory contained in data */
+    void (*mr_free_data)(void *data);
+
     /* The neighbours (pointers to next and previous) */
     struct mr_list_elt *next;
@@ -32 +35 @@
 
 void mr_list_alloc(struct mr_list *list);
-void mr_list_alloc_elt(struct mr_list_elt *elt, void *data);
+void mr_list_alloc_elt(struct mr_list_elt *elt, void *data, void (*mr_free_data)(void *data));
 void mr_list_free(struct mr_list *list);
 void mr_list_free_elt(struct mr_list_elt *elt);

branches/stable/mondo/src/lib/mr_list.c

@@ -21 +21 @@
 
 /* Elt of list allocation and initialization */
-void mr_list_alloc_elt(struct mr_list_elt *elt, void *data) {
+void mr_list_alloc_elt(struct mr_list_elt *elt, void *data, void (*mr_free_data)(void *data)) {
 
     elt = mr_malloc(sizeof(struct mr_list_elt));
+    elt->mr_free_data = mr_free_data;
     elt->data = (void *)data;
     elt->prev = NULL;
@@ -30 +31 @@
 
 void mr_list_free_elt(struct mr_list_elt *elt) {
+    elt->mr_free_data(elt->data);
     mr_free(elt->data);
     mr_free(elt);