Use the command line utility dropdb instead of the psql command

[bacula/bacula] / bacula / src / lib / dlist.c

diff --git a/bacula/src/lib/dlist.c b/bacula/src/lib/dlist.c
index f356658c909854ce1a1ddd785e5f596ce03f66c1..3b6d289147c3686b6d91e8951180ece2bbfc95b4 100644 (file)
--- a/bacula/src/lib/dlist.c
+++ b/bacula/src/lib/dlist.c
@@ -48,6 +48,7 @@ void dlist::append(void *item)
    if (head == NULL) {               /* if empty list, */
       head = item;                   /* item is head as well */
    }
+   num_items++;
 }
 
 /*
@@ -64,6 +65,7 @@ void dlist::prepend(void *item)
    if (tail == NULL) {               /* if empty list, */                    
       tail = item;                   /* item is tail too */
    }
+   num_items++;
 }
 
 void dlist::insert_before(void *item, void *where)      
@@ -80,6 +82,7 @@ void dlist::insert_before(void *item, void *where)
    if (head == where) {
       head = item;
    }
+   num_items++;
 }
 
 void dlist::insert_after(void *item, void *where)      
@@ -96,6 +99,7 @@ void dlist::insert_after(void *item, void *where)
    if (tail == where) {
       tail = item;
    }
+   num_items++;
 }
 
 
@@ -105,17 +109,24 @@ void dlist::remove(void *item)
    dlink *ilink = (dlink *)((char *)item+loffset);   /* item's link */
    if (item == head) {
       head = ilink->next;
-      ((dlink *)((char *)head+loffset))->prev = NULL;
+      if (head) {
+        ((dlink *)((char *)head+loffset))->prev = NULL;
+      }
+      if (item == tail) {
+        tail = ilink->prev;
+      }
    } else if (item == tail) {
       tail = ilink->prev;
-      ((dlink *)((char *)tail+loffset))->next = NULL;
+      if (tail) {
+        ((dlink *)((char *)tail+loffset))->next = NULL;
+      }
    } else {
       xitem = ilink->next;
       ((dlink *)((char *)xitem+loffset))->prev = ilink->prev;
       xitem = ilink->prev;
       ((dlink *)((char *)xitem+loffset))->next = ilink->next;
    }
-   free(item);
+   num_items--;
 }
 
 void * dlist::next(void *item)
@@ -135,7 +146,7 @@ void * dlist::prev(void *item)
 }
 
 
-/* Destroy the list and its contents */
+/* Destroy the list contents */
 void dlist::destroy()
 {
    for (void *n=head; n; ) {
@@ -143,6 +154,7 @@ void dlist::destroy()
       free(n);
       n = ni;
    }
+   num_items = 0;
 }
 
 
@@ -186,13 +198,42 @@ int main()
    jcr_chain->insert_before(jcr, next_jcr);
    
    printf("Print remaining list.\n");
-   for (MYJCR *jcr=NULL; (jcr=(MYJCR *)jcr_chain->next(jcr)); ) {
+   foreach_dlist (jcr, jcr_chain) {
       printf("Dlist item = %s\n", jcr->buf);
       free(jcr->buf);
    }
    jcr_chain->destroy();
    free(jcr_chain);
 
+   jcr_chain = new dlist(jcr, &jcr->link);
+   printf("append 20 items 0-19\n");
+   for (int i=0; i<20; i++) {
+      sprintf(buf, "This is dlist item %d", i);
+      jcr = (MYJCR *)malloc(sizeof(MYJCR));
+      jcr->buf = bstrdup(buf);
+      jcr_chain->append(jcr);
+      if (i == 10) {
+        save_jcr = jcr;
+      }
+   }
+
+   next_jcr = (MYJCR *)jcr_chain->next(save_jcr);
+   printf("11th item=%s\n", next_jcr->buf);
+   jcr = (MYJCR *)malloc(sizeof(MYJCR));
+   jcr->buf = save_jcr->buf;
+   printf("Remove 10th item\n");
+   jcr_chain->remove(save_jcr);
+   printf("Re-insert 10th item\n");
+   jcr_chain->insert_before(jcr, next_jcr);
+   
+   printf("Print remaining list.\n");
+   foreach_dlist (jcr, jcr_chain) {
+      printf("Dlist item = %s\n", jcr->buf);
+      free(jcr->buf);
+   }
+
+   delete jcr_chain;
+
    sm_dump(False);
 
 }