Commit 6e5d5485 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

Get rid of calls to free. Should use toku_free. Fixes #275.

git-svn-id: file:///svn/tokudb@1677 c7de825b-a66e-492c-adef-691d508d4ae1
parent 86f9b226
...@@ -282,7 +282,7 @@ int toku_logger_commit (TOKUTXN txn, int nosync) { ...@@ -282,7 +282,7 @@ int toku_logger_commit (TOKUTXN txn, int nosync) {
while ((item=txn->oldest_logentry)) { while ((item=txn->oldest_logentry)) {
txn->oldest_logentry = item->next; txn->oldest_logentry = item->next;
logtype_dispatch(item, toku_free_logtype_); logtype_dispatch(item, toku_free_logtype_);
free(item); toku_free(item);
} }
toku_free(txn); toku_free(txn);
return r; return r;
...@@ -695,7 +695,7 @@ int toku_logger_abort(TOKUTXN txn) { ...@@ -695,7 +695,7 @@ int toku_logger_abort(TOKUTXN txn) {
while ((item=txn->newest_logentry)) { while ((item=txn->newest_logentry)) {
txn->newest_logentry=item->tmp; txn->newest_logentry=item->tmp;
logtype_dispatch(item, toku_free_logtype_); logtype_dispatch(item, toku_free_logtype_);
free(item); toku_free(item);
} }
toku_free(txn); toku_free(txn);
return 0; return 0;
......
...@@ -1148,9 +1148,9 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag) ...@@ -1148,9 +1148,9 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag)
if (0) { if (0) {
delete_silently_and_retry: delete_silently_and_retry:
//Free any old data. //Free any old data.
free(key->data); toku_free(key->data);
free(pkey->data); toku_free(pkey->data);
free(data->data); toku_free(data->data);
//Silently delete and re-run. //Silently delete and re-run.
r = toku_c_del_noassociate(c, 0); r = toku_c_del_noassociate(c, 0);
if (r != 0) return r; if (r != 0) return r;
...@@ -1163,19 +1163,19 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag) ...@@ -1163,19 +1163,19 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag)
r = toku_c_pget_save_original_data(&copied_key, o_key); if (r!=0) goto died0; r = toku_c_pget_save_original_data(&copied_key, o_key); if (r!=0) goto died0;
if (0) { if (0) {
died1: died1:
free(key->data); toku_free(key->data);
goto died0; goto died0;
} }
r = toku_c_pget_save_original_data(&copied_pkey, o_pkey); if (r!=0) goto died1; r = toku_c_pget_save_original_data(&copied_pkey, o_pkey); if (r!=0) goto died1;
if (0) { if (0) {
died2: died2:
free(pkey->data); toku_free(pkey->data);
goto died1; goto died1;
} }
r = toku_c_pget_save_original_data(&copied_data, o_data); if (r!=0) goto died2; r = toku_c_pget_save_original_data(&copied_data, o_data); if (r!=0) goto died2;
if (0) { if (0) {
died3: died3:
free(data->data); toku_free(data->data);
goto died2; goto died2;
} }
...@@ -1195,9 +1195,9 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag) ...@@ -1195,9 +1195,9 @@ static int toku_c_pget(DBC * c, DBT *key, DBT *pkey, DBT *data, u_int32_t flag)
r3 = toku_brt_dbt_set_value(pdb->i->brt, o_data, data->data, data->size); r3 = toku_brt_dbt_set_value(pdb->i->brt, o_data, data->data, data->size);
//Cleanup. //Cleanup.
free(key->data); toku_free(key->data);
free(pkey->data); toku_free(pkey->data);
free(data->data); toku_free(data->data);
if (r!=0) return r; if (r!=0) return r;
if (r2!=0) return r2; if (r2!=0) return r2;
return r3; return r3;
...@@ -1311,7 +1311,7 @@ static int toku_db_del_noassociate(DB * db, DB_TXN * txn, DBT * key, u_int32_t f ...@@ -1311,7 +1311,7 @@ static int toku_db_del_noassociate(DB * db, DB_TXN * txn, DBT * key, u_int32_t f
r = toku_db_get_noassociate(db, txn, key, &search_val, 0); r = toku_db_get_noassociate(db, txn, key, &search_val, 0);
if (r != 0) if (r != 0)
return r; return r;
free(search_val.data); toku_free(search_val.data);
} }
//Do the actual deleting. //Do the actual deleting.
r = toku_brt_delete(db->i->brt, key); r = toku_brt_delete(db->i->brt, key);
...@@ -1420,8 +1420,8 @@ static int toku_c_put(DBC *dbc, DBT *key, DBT *data, u_int32_t flags) { ...@@ -1420,8 +1420,8 @@ static int toku_c_put(DBC *dbc, DBT *key, DBT *data, u_int32_t flags) {
if (0) { if (0) {
cleanup: cleanup:
if (flags==DB_CURRENT) { if (flags==DB_CURRENT) {
free(key_local.data); toku_free(key_local.data);
free(data_local.data); toku_free(data_local.data);
} }
return r; return r;
} }
...@@ -1864,7 +1864,7 @@ static int do_associated_inserts (DB_TXN *txn, DBT *key, DBT *data, DB *secondar ...@@ -1864,7 +1864,7 @@ static int do_associated_inserts (DB_TXN *txn, DBT *key, DBT *data, DB *secondar
#endif #endif
r = toku_db_put_noassociate(secondary, txn, &idx, key, DB_YESOVERWRITE); r = toku_db_put_noassociate(secondary, txn, &idx, key, DB_YESOVERWRITE);
if (idx.flags & DB_DBT_APPMALLOC) { if (idx.flags & DB_DBT_APPMALLOC) {
free(idx.data); toku_free(idx.data);
} }
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment