Changeset 24047 for gs2-extensions/tdb-edit

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()

Location:

gs2-extensions/tdb-edit/trunk/src/src

Files:

• tdbget-src/tdbget.cpp (modified) (3 diffs)
• tdbkeys-src/tdbkeys.cpp (modified) (4 diffs)
• tdbset-src/tdbset.cpp (modified) (4 diffs)

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

@@ -50 +50 @@
 printUsage (char *program_name)
 {
-  cerr << "usage: " << program_name << " <database_path> <key>" << endl;
-  cerr << endl;
+  cerr << "usage: " << program_name << " <database_path> <key>" << endl << endl;
 }
 /** printUsage() **/
@@ -92 +91 @@
     }
     cout << endl; // used to be printf("\n");
+    // caller responsible for freeing this memory
     free(value.dptr);
   }
@@ -98 +98 @@
     cout << endl; // used to be printf("\n");
   }
-  free(key.dptr);
 
   tdb_close (tdb);

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);
 

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

@@ -74 +74 @@
   int tdb_flags = TDB_DEFAULT; // Default = 0
   int tdb_store_flags = TDB_DEFAULT; // used later when storing
-  int open_flags = O_RDWR;
+  int open_flags = O_RDWR | O_CREAT;
   TDB_CONTEXT *tdb = tdb_open(dbname, hash_size, tdb_flags, open_flags, 0664);
   if (!tdb)
@@ -123 +123 @@
       }
 
+      // I'm responsible for freeing some memory
       delete [] concat_data;
-      free(concat_value_data.dptr);
       free(original_value_data.dptr);
     }
@@ -144 +144 @@
       cerr << "failed to set [" << argv[2] << "] to '" << argv[3] << "'" << endl;
     }
-
-    free(value_data.dptr);
   }
   // only given a key? that's a deleting
@@ -156 +154 @@
   }
 
-  free(key_data.dptr);
-
   tdb_close(tdb);