X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdisk_history.c;h=5b5de24a085d9e23ae6652792adb1f20fae97b47;hb=HEAD;hp=c26bce60228ccb67769110dcd2ea0e6dbda22f2b;hpb=e442edb4d5816c4ad107ad9e71164f845eba70ad;p=debian%2Famanda

diff --git a/server-src/disk_history.c b/server-src/disk_history.c
index c26bce6..5b5de24 100644
--- a/server-src/disk_history.c
+++ b/server-src/disk_history.c
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -76,36 +77,14 @@ add_dump(
 
     /* See if we already have partnum=partnum-1 */
     if (partnum > 1) {
-	int partnum_minus_1 = 0;
 	for(item = disk_hist, before = NULL; item;
 	    before = item, item = item->next) {
 	    if (!strcmp(item->date, date) &&
 		    item->level == level && item->is_split) {
-		tapelist_t *cur_tape;
-		for (cur_tape = item->tapes; cur_tape;
-					     cur_tape = cur_tape->next) {
-		    int files;
-		    for(files=0; files<cur_tape->numfiles; files++) {
-			if (cur_tape->partnum[files] == partnum - 1)
-			    partnum_minus_1 = 1;
-		    }
-		}
-		if (partnum_minus_1 == 1) {
-		    item->tapes = append_to_tapelist(item->tapes, tape, file,
-						     partnum, isafile);
-		    if (maxpart > item->maxpart)
-			item->maxpart = maxpart;
-		} else {
-		    /* some part are missing, remove the item from disk_hist */
-		    if (before)
-			before->next = item->next;
-		    else
-			disk_hist = item->next;
-		    /* free item */
-		    free_tapelist(item->tapes);
-		    amfree(item->hostname);
-		    amfree(item);
-		}
+		item->tapes = append_to_tapelist(item->tapes, tape, file,
+						 partnum, isafile);
+		if (maxpart > item->maxpart)
+		    item->maxpart = maxpart;
 		return;
 	    }
 	}
@@ -132,7 +111,6 @@ add_dump(
     if (disk_hist == NULL)
     {
 	disk_hist = new;
-	new->tapes = append_to_tapelist(new->tapes, tape, file, isafile);
 	new->next = NULL;
 	return;
     }