Changeset 24047 for gs2-extensions/tdb-edit/trunk/src/src/tdbkeys-src/tdbkeys.cpp

Timestamp:

2011-05-19T12:10:52+12:00 (13 years ago)

Author:

jmt12

Message:

I'd misunderstood where I needed to free the memory allocated to storing char*s in the TDB_DATA. Apparently I only have to free them when they are returned by tdb_fetch() or similar. Removed segfault causing calls to free()

File:

• gs2-extensions/tdb-edit/trunk/src/src/tdbkeys-src/tdbkeys.cpp (modified) (4 diffs)

gs2-extensions/tdb-edit/trunk/src/src/tdbkeys-src/tdbkeys.cpp

@@ -47 +47 @@
 /**
  */
-void 
-printUsage(char *program_name) 
+void
+printUsage(char *program_name)
 {
   cerr << "usage: " << program_name << " <database_path>" << endl << endl;
@@ -59 +59 @@
  *  @param argv - and char * array containing first the executable name, then
  *                the name of/path to the database
- *  @return 0 
+ *  @return 0
  */
 int
@@ -76 +76 @@
   int hash_size = 0;
   int tdb_flags = TDB_DEFAULT;
-  int open_flags = O_RDONLY; 
+  int open_flags = O_RDONLY;
   TDB_CONTEXT *tdb = tdb_open(dbname, hash_size, tdb_flags, open_flags, 0664);
   if (!tdb)
@@ -97 +97 @@
 
     /* free old key's dptr, otherwise causes memory leak */
-    free(key.dptr); 
-    
+    free(key.dptr);
+
     /* can now safely copy content of nextkey into key */
     key = nextkey;
   }
-  
+
   tdb_close(tdb);