Repository: trafficserver Updated Branches: refs/heads/master 7d8c13ec1 -> 4ec3793a7
TS-3858: Remove xfree cruft. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4ec3793a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4ec3793a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4ec3793a Branch: refs/heads/master Commit: 4ec3793a7f65ad2104e992263f02b8f76d7d4ca1 Parents: 7d8c13e Author: Phil Sorber <[email protected]> Authored: Thu Aug 20 13:24:33 2015 -0600 Committer: Phil Sorber <[email protected]> Committed: Thu Aug 20 13:24:33 2015 -0600 ---------------------------------------------------------------------- lib/records/test_RecProcess.i | 4 ++-- lib/ts/ink_hash_table.cc | 23 ----------------------- lib/ts/ink_hash_table.h | 1 - mgmt/Alarms.cc | 4 ++-- mgmt/WebMgmtUtils.cc | 4 ++-- mgmt/cluster/VMap.cc | 6 +++--- mgmt/utils/MgmtHashTable.h | 6 +++--- proxy/http/HttpSM.cc | 2 +- 8 files changed, 13 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/lib/records/test_RecProcess.i ---------------------------------------------------------------------- diff --git a/lib/records/test_RecProcess.i b/lib/records/test_RecProcess.i index 666bae3..237e351 100644 --- a/lib/records/test_RecProcess.i +++ b/lib/records/test_RecProcess.i @@ -46,7 +46,7 @@ void RecDumpRecordsHt(RecT rec_type); do { \ RecString rec_string = 0; \ if (RecGetRecordString_Xmalloc("proxy.config.parse_"name, &rec_string) != REC_ERR_FAIL) { \ - if (rec_string) xfree(rec_string); \ + if (rec_string) ats_free(rec_string); \ printf(" parse_"name": FAIL\n"); \ failures++; \ } else { \ @@ -64,7 +64,7 @@ void RecDumpRecordsHt(RecT rec_type); printf(" parse_"name": FAIL\n"); \ failures++; \ } \ - xfree(rec_string); \ + ats_free(rec_string); \ } else { \ printf(" parse_"name": FAIL\n"); \ failures++; \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/lib/ts/ink_hash_table.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_hash_table.cc b/lib/ts/ink_hash_table.cc index b197d8b..f6e328b 100644 --- a/lib/ts/ink_hash_table.cc +++ b/lib/ts/ink_hash_table.cc @@ -117,20 +117,6 @@ _ink_hash_table_free_entry_value(InkHashTable *ht_ptr, InkHashTableEntry *e) return (0); } /* End _ink_hash_table_free_entry_value */ - -static int -_ink_hash_table_xfree_entry_value(InkHashTable *ht_ptr, InkHashTableEntry *e) -{ - InkHashTableValue value; - - value = ink_hash_table_entry_value(ht_ptr, e); - if (value != NULL) { - ats_free(value); - } - - return (0); -} /* End _ink_hash_table_xfree_entry_value */ - InkHashTable * ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr) { @@ -139,15 +125,6 @@ ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr) return (InkHashTable *)0; } /* End ink_hash_table_destroy_and_free_values */ -InkHashTable * -ink_hash_table_destroy_and_xfree_values(InkHashTable *ht_ptr) -{ - ink_hash_table_map(ht_ptr, _ink_hash_table_xfree_entry_value); - ink_hash_table_destroy(ht_ptr); - return (InkHashTable *)0; -} /* End ink_hash_table_destroy_and_xfree_values */ - - /*---------------------------------------------------------------------------* int ink_hash_table_isbound(InkHashTable *ht_ptr, InkHashTableKey key) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/lib/ts/ink_hash_table.h ---------------------------------------------------------------------- diff --git a/lib/ts/ink_hash_table.h b/lib/ts/ink_hash_table.h index 5017d16..76beeb2 100644 --- a/lib/ts/ink_hash_table.h +++ b/lib/ts/ink_hash_table.h @@ -70,7 +70,6 @@ typedef enum { InkHashTable *ink_hash_table_create(InkHashTableKeyType key_type); InkHashTable *ink_hash_table_destroy(InkHashTable *ht_ptr); InkHashTable *ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr); -InkHashTable *ink_hash_table_destroy_and_xfree_values(InkHashTable *ht_ptr); inkcoreapi int ink_hash_table_isbound(InkHashTable *ht_ptr, const char *key); inkcoreapi int ink_hash_table_lookup(InkHashTable *ht_ptr, const char *key, InkHashTableValue *value_ptr); inkcoreapi int ink_hash_table_delete(InkHashTable *ht_ptr, const char *key); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/mgmt/Alarms.cc ---------------------------------------------------------------------- diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc index 3511b70..d444a7b 100644 --- a/mgmt/Alarms.cc +++ b/mgmt/Alarms.cc @@ -74,8 +74,8 @@ Alarms::Alarms() Alarms::~Alarms() { ink_hash_table_destroy(cblist); - ink_hash_table_destroy_and_xfree_values(local_alarms); - ink_hash_table_destroy_and_xfree_values(remote_alarms); + ink_hash_table_destroy_and_free_values(local_alarms); + ink_hash_table_destroy_and_free_values(remote_alarms); ink_mutex_destroy(&mutex); } /* End Alarms::Alarms */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/mgmt/WebMgmtUtils.cc ---------------------------------------------------------------------- diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc index e0c817b..e9df35e 100644 --- a/mgmt/WebMgmtUtils.cc +++ b/mgmt/WebMgmtUtils.cc @@ -796,7 +796,7 @@ varType(const char *varName) // Creates a hash table with name value pairs // // CALLEE must deallocate the returned hash table with -// ink_hash_table_destroy_and_xfree_values(InkHashTable *ht_ptr) +// ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr) // InkHashTable * @@ -854,7 +854,7 @@ processFormSubmission(char *submission) // Creates a hash table with name value pairs // // CALLEE must deallocate the returned hash table with -// ink_hash_table_destroy_and_xfree_values(InkHashTable *ht_ptr) +// ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr) // // Note: This function will _not_ substituteUnsafeChars() InkHashTable * http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/mgmt/cluster/VMap.cc ---------------------------------------------------------------------- diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc index e48987e..8a2e14f 100644 --- a/mgmt/cluster/VMap.cc +++ b/mgmt/cluster/VMap.cc @@ -216,9 +216,9 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m) VMap::~VMap() { if (id_map) - ink_hash_table_destroy_and_xfree_values(id_map); + ink_hash_table_destroy_and_free_values(id_map); - ink_hash_table_destroy_and_xfree_values(interface_realip_map); + ink_hash_table_destroy_and_free_values(interface_realip_map); ink_hash_table_destroy(our_map); ink_hash_table_destroy(ext_map); ats_free(this->interface); @@ -322,7 +322,7 @@ VMap::lt_readAListFile(const char *fname) ink_mutex_acquire(mutex); rl_downAddrs(); /* Down everything before we re-init */ if (id_map) { - ink_hash_table_destroy_and_xfree_values(id_map); + ink_hash_table_destroy_and_free_values(id_map); } id_map = ink_hash_table_create(InkHashTableKeyType_String); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/mgmt/utils/MgmtHashTable.h ---------------------------------------------------------------------- diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h index f1b7219..e538801 100644 --- a/mgmt/utils/MgmtHashTable.h +++ b/mgmt/utils/MgmtHashTable.h @@ -40,10 +40,10 @@ class MgmtHashTable { public: - MgmtHashTable(const char *name, bool xfree_on_delete, InkHashTableKeyType type) + MgmtHashTable(const char *name, bool free_on_delete, InkHashTableKeyType type) { ink_mutex_init(&mutex, name); - destroy_and_free = xfree_on_delete; + destroy_and_free = free_on_delete; ht = ink_hash_table_create(type); } @@ -51,7 +51,7 @@ public: { ink_mutex_acquire(&mutex); if (destroy_and_free) { - ink_hash_table_destroy_and_xfree_values(ht); + ink_hash_table_destroy_and_free_values(ht); } else { ink_hash_table_destroy(ht); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ec3793a/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 40a86d1..5ed3de0 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -6018,7 +6018,7 @@ HttpSM::setup_internal_transfer(HttpSMHandler handler_arg) t_state.internal_msg_buffer_fast_allocator_size); - // The IOBufferBlock will xfree the msg buffer when necessary so + // The IOBufferBlock will free the msg buffer when necessary so // eliminate our pointer to it t_state.internal_msg_buffer = NULL; t_state.internal_msg_buffer_size = 0;
