Changeset 1392 in MondoRescue for branches/stable/mondo/src

Timestamp:

May 6, 2007, 1:55:53 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a bug for allocation (pointer manipulation again - Thanks again Michel Loiseleur :-)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-stream.c (modified) (4 diffs)
• include/mr_list.h (modified) (1 diff)
• lib/mr_list.c (modified) (2 diffs)

branches/stable/mondo/src/common/libmondo-stream.c

@@ -639 +639 @@
 
     assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-    mr_list_alloc(tapecatalog);
+    tapecatalog = mr_list_alloc();
     g_tape_posK = 0;
     if (g_tape_stream) {
@@ -735 +735 @@
     /*  initialise the catalog */
     g_current_media_number = 1;
-    mr_list_alloc(tapecatalog);
+    tapecatalog = mr_list_alloc();
     /* log stuff */
     log_it("Opening OUT cdstream with the command");
@@ -765 +765 @@
         return (0);
     }
-    mr_list_alloc(tapecatalog);
+    tapecatalog = mr_list_alloc();
     g_tape_posK = 0;
 
@@ -1080 +1080 @@
 
     /* place the data in a list elt */
-    mr_list_alloc_elt(elt, (void *)te, mr_free_te);
+    elt = mr_list_alloc_elt((void *)te, mr_free_te);
     mr_list_add_elt_last(tapecatalog, elt);
 

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

@@ -34 +34 @@
 /* functions (public methods) */
 
-void mr_list_alloc(struct mr_list *list);
-void mr_list_alloc_elt(struct mr_list_elt *elt, void *data, void (*mr_free_data)(void *data));
+struct mr_list *mr_list_alloc(void);
+struct mr_list_elt *mr_list_alloc_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

@@ -15 +15 @@
 
 /* List allocation and initialization */
-void mr_list_alloc(struct mr_list *list) {
+struct mr_list *mr_list_alloc(void) {
 
     list = mr_malloc(sizeof(struct mr_list));
     list->first = NULL;
     list->last = NULL;
+    return(list);
 }
 
 /* Elt of list allocation and initialization */
-void mr_list_alloc_elt(struct mr_list_elt *elt, void *data, void (*mr_free_data)(void *data)) {
+struct mr_list_elt *mr_list_alloc_elt(void *data, void (*mr_free_data)(void *data)) {
 
     elt = mr_malloc(sizeof(struct mr_list_elt));
@@ -30 +31 @@
     elt->prev = NULL;
     elt->next = NULL;
+    return(elt);
 }