Changeset 1459 for trunk

Timestamp:

2000-08-28T10:27:20+12:00 (24 years ago)

Author:

sjboddie

Message:

Did some tidying up of destructor functions as a result of a few hours
spent playing with ccmalloc

Location:

trunk/gsdl/src

Files:

• colservr/collectserver.cpp (modified) (1 diff)
• colservr/mggdbmsource.cpp (modified) (1 diff)
• colservr/queryfilter.cpp (modified) (1 diff)
• recpt/infodbclass.cpp (modified) (1 diff)
• recpt/infodbclass.h (modified) (1 diff)
• recpt/librarymain.cpp (modified) (1 diff)
• recpt/nullproto.cpp (modified) (1 diff)
• recpt/nullproto.h (modified) (1 diff)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -36 +36 @@
 
 collectserver::~collectserver () {
+
+  // clean up the sources
+  sourcelistclass::iterator source_here = sources.begin();
+  sourcelistclass::iterator source_end = sources.end();
+  while (source_here != source_end) {
+    if ((*source_here).s != NULL)
+      delete (*source_here).s;
+    source_here++;
+  }
+  sources.clear();
+
+  // clean up the filters
+  filtermapclass::iterator filter_here = filters.begin();
+  filtermapclass::iterator filter_end = filters.end();
+  while (filter_here != filter_end) {
+    if ((*filter_here).second.f != NULL) 
+      delete (*filter_here).second.f;
+    filter_here++;
+  }
+  filters.clear();
 }
 

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -36 +36 @@
 
 mggdbmsourceclass::~mggdbmsourceclass () {
+  if (gdbmptr != NULL) delete gdbmptr;
+  if (mgsearchptr != NULL) delete mgsearchptr;
 }
 

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -292 +292 @@
 
 queryfilterclass::~queryfilterclass () {
+  // don't delete gdbmptr or mgsearchptr here, they'll 
+  // be cleaned up by mggdbmsource
 }
 

trunk/gsdl/src/recpt/infodbclass.cpp

@@ -102 +102 @@
 
 
-
+gdbmclass::~gdbmclass() {
+  closedatabase();
+}
 
 // returns true if opened

trunk/gsdl/src/recpt/infodbclass.h

@@ -130 +130 @@
 public:
   gdbmclass() {gdbmfile = NULL; logout = &cerr;};
-  ~gdbmclass() {};
+  ~gdbmclass();
   
   // returns true if opened

trunk/gsdl/src/recpt/librarymain.cpp

@@ -117 +117 @@
 #endif
 
-    // this memory is created but never destroyed
-    // we're also not doing any error checking to make sure we didn't
-    // run out of memory
     collectserver *cserver = new collectserver();
     gdbmclass *gdbmhandler = new gdbmclass();

trunk/gsdl/src/recpt/nullproto.cpp

@@ -28 +28 @@
 #include <assert.h>
 
+nullproto::~nullproto() {
+  collectservermapclass::iterator here = cservers.begin();
+  collectservermapclass::iterator end = cservers.end();
+
+  while (here != end) {
+    if ((*here).second.c != NULL) {
+      delete (*here).second.c;
+    }
+    here ++;
+  }
+  cservers.clear();
+}
 
 // this configure will configure each of the collection servers

trunk/gsdl/src/recpt/nullproto.h

@@ -37 +37 @@
   collectservermapclass cservers;
 public:
-  virtual ~nullproto() {}
+  virtual ~nullproto();
 
   // add_collectserver should be called for each collection server