Changeset 1369 in MondoRescue

Timestamp:

Apr 30, 2007, 2:04:01 AM (18 years ago)

Author:

Bruno Cornec

Message:

Remove unused function + compilation fixes

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (12 diffs)

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

@@ -15 +15 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_list.h"
 
 #include "mondostructures.h"
@@ -95 +96 @@
  * made of a list of @p s_tapecat_entry.
  * */
-static struct mr_list *g_tapecatalog;
+static struct mr_list *tapecatalog;
 
 /* function to free the fname field allocated in te */
@@ -177 +178 @@
     }
     mr_free(blk);
-    mr_free_fname(g_tapecatalog);
-    mr_list_free(g_tapecatalog);
+    mr_list_free(tapecatalog);
     return (retval);
 }
@@ -226 +226 @@
     paranoid_pclose(g_tape_stream);
     log_it("closeout_tape() -- leaving");
-    elt = g_tapecatalog->first;
+    elt = tapecatalog->first;
     while (elt != NULL) {
         te = (struct s_tapecat_entry *)elt->data;
@@ -236 +236 @@
     }
     mr_free(blk);
-    mr_free_fname(g_tapecatalog);
-    mr_list_free(g_tapecatalog);
+    mr_list_free(tapecatalog);
     return (retval);
 }
@@ -508 +507 @@
     long long final_alleged_writeK, final_projected_certain_writeK,
         final_actually_certain_writeK = 0, cposK, bufsize_K;
-    int last, curr, i;
+    int last, i;
     t_archtype type = other;
     char *command = NULL;
@@ -536 +535 @@
     mr_free(command);
 
-    last = mr_list_length(g_tapecatalog) - 1;
+    last = mr_list_length(tapecatalog) - 1;
     if (last <= 0) {
         iamhere("Too early to start deleting from collection.");
         return (0);
     }
-    elt = g_tapecatalog->last;
+    elt = tapecatalog->last;
     te = (struct s_tapecat_entry *)elt->data;
     final_alleged_writeK = te->tape_posK;
@@ -640 +639 @@
 
     assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-    mr_list_alloc(g_tapecatalog);
+    mr_list_alloc(tapecatalog);
     g_tape_posK = 0;
     if (g_tape_stream) {
@@ -736 +735 @@
     /*  initialise the catalog */
     g_current_media_number = 1;
-    mr_list_alloc(g_tapecatalog);
+    mr_list_alloc(tapecatalog);
     /* log stuff */
     log_it("Opening OUT cdstream with the command");
@@ -766 +765 @@
         return (0);
     }
-    mr_list_alloc(g_tapecatalog);
+    mr_list_alloc(tapecatalog);
     g_tape_posK = 0;
 
@@ -1085 +1084 @@
 
     // returns the index of the record we've just added
-    return (mr_list_length(g_tapecatalog));
+    return (mr_list_length(tapecatalog));
 }
 
@@ -1358 +1357 @@
 
     mr_msg(2, "I am now writing back catalog to tape");
-    elt = g_tapecatalog->first;
+    elt = tapecatalog->first;
     while (elt != NULL) {
         te = (struct s_tapecat_entry *) elt->data;