Imported Upstream version 3.3.2

[debian/amanda] / server-src / holding.c

diff --git a/server-src/holding.c b/server-src/holding.c
index 15286bd3a432760d2577a2811aece707efce90b0..6da3e47fdf940b8c6f5b82107a8813df133f75d3 100644 (file)
--- a/server-src/holding.c
+++ b/server-src/holding.c
@@ -401,12 +401,9 @@ holding_walk(
     for (il = getconf_identlist(CNF_HOLDINGDISK);
                il != NULL;
                il = il->next) {
-       int is_cruft = 0;
        hdisk_conf = lookup_holdingdisk(il->data);
 
        hdisk = holdingdisk_get_diskdir(hdisk_conf);
-       if (!is_dir(hdisk))
-           is_cruft = 1;
 
        if (per_disk_fn) 
            proceed = per_disk_fn(datap, 
@@ -558,7 +555,7 @@ holding_get_files_for_flush(
        dumpfile_free_data(&file);
     }
 
-    if (file_list) g_slist_free_full(file_list);
+    if (file_list) slist_free_full(file_list, g_free);
 
     return result_list;
 }
@@ -584,7 +581,7 @@ holding_get_all_datestamps(void)
        dumpfile_free_data(&dfile);
     }
 
-    g_slist_free_full(all_files);
+    slist_free_full(all_files, g_free);
 
     return datestamps;
 }
@@ -781,7 +778,7 @@ holding_cleanup_file(
        return 0;
     }
 
-    if(file.dumplevel < 0 || file.dumplevel > 9) {
+    if(file.dumplevel < 0 || file.dumplevel > 399) {
        if (data->verbose_output)
            g_fprintf(data->verbose_output, 
                _("File '%s' has invalid level %d\n"), element, file.dumplevel);