aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-01-14 20:14:43 +0000
committerBill Meier <wmeier@newsguy.com>2012-01-14 20:14:43 +0000
commit439adbdbcc64acf3b67f81c2d2f48b7baf3c1045 (patch)
treec20e364099b3ed1e8c9c751866343bb48736ac46
parentba04b5b113f40e407dfc986b891526fdf4ebb0b1 (diff)
Remove obsolete comments referring to mem_chunks.
svn path=/trunk/; revision=40507
-rw-r--r--epan/camel-persistentdata.c4
-rw-r--r--epan/dissectors/packet-ipx.c2
-rw-r--r--epan/dissectors/packet-mac-lte.c2
-rw-r--r--epan/dissectors/packet-ndps.c2
-rw-r--r--epan/dissectors/packet-pdcp-lte.c2
-rw-r--r--epan/dissectors/packet-rlc-lte.c2
-rw-r--r--epan/dissectors/packet-sip.c2
-rw-r--r--epan/reassemble.c11
-rw-r--r--epan/tcap-persistentdata.c12
-rw-r--r--file.c5
10 files changed, 18 insertions, 26 deletions
diff --git a/epan/camel-persistentdata.c b/epan/camel-persistentdata.c
index 315700f274..8abfecb242 100644
--- a/epan/camel-persistentdata.c
+++ b/epan/camel-persistentdata.c
@@ -233,7 +233,7 @@ void
camelsrt_init_routine(void)
{
- /* free hash-tables and mem_chunks for SRT */
+ /* free hash-table for SRT */
if (srt_calls != NULL) {
#ifdef DEBUG_CAMELSRT
dbg(16,"Destroy hash ");
@@ -241,7 +241,7 @@ camelsrt_init_routine(void)
g_hash_table_destroy(srt_calls);
}
- /* create new hash-tables and mem_chunks for SRT */
+ /* create new hash-table for SRT */
srt_calls = g_hash_table_new(camelsrt_call_hash, camelsrt_call_equal);
#ifdef DEBUG_CAMELSRT
dbg(16,"Create hash ");
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index d1fb91e263..b2a2975599 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -457,7 +457,7 @@ spx_hash_func(gconstpointer v)
return GPOINTER_TO_UINT(spx_key->conversation) + spx_key->spx_src;
}
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash table each time a new
* file is loaded or re-loaded in wireshark */
static void
spx_init_protocol(void)
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 37dbe25674..3b57dd87da 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -4062,7 +4062,7 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash tables each time a new
* file is loaded or re-loaded in wireshark */
static void
mac_lte_init_protocol(void)
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 2619521999..3fb8b0d0a0 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -4098,7 +4098,7 @@ ndps_hash(gconstpointer v)
return GPOINTER_TO_UINT(ndps_key->conversation) + ndps_key->ndps_xport;
}
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash table each time a new
* file is loaded or re-loaded in wireshark */
static void
ndps_init_protocol(void)
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 144a89d05e..810bfe2727 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -2418,7 +2418,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
#endif
}
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash tables each time a new
* file is loaded or re-loaded in wireshark */
static void
pdcp_lte_init_protocol(void)
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index fe1986f790..e381ae2c24 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -2600,7 +2600,7 @@ static void dissect_rlc_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash tables each time a new
* file is loaded or re-loaded in wireshark */
static void
rlc_lte_init_protocol(void)
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index c4cb473a1e..9d1d131723 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -905,7 +905,7 @@ static gint sip_equal(gconstpointer v, gconstpointer v2)
}
-/* Initializes the hash table and the mem_chunk area each time a new
+/* Initializes the hash table each time a new
* file is loaded or re-loaded in wireshark */
static void
sip_init_protocol(void)
diff --git a/epan/reassemble.c b/epan/reassemble.c
index 17d8a35e8f..7a82c8a631 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -194,19 +194,16 @@ reassembled_hash(gconstpointer k)
/*
* For a fragment hash table entry, free the associated fragments.
- * If slices are used (GLIB >= 2.10) the entry value (fd_chain) is
- * freed herein and the entry is freed when fragment_free_key()
- * [or dcerpc_fragment_free_key()] is called (as a consequence of
- * returning TRUE from this function).
- * If mem_chunks are used, free the address data to which the key
- * refers.
+ * The entry value (fd_chain) is freed herein and the entry is freed
+ * when fragment_free_key() [or dcerpc_fragment_free_key()] is called
+ * (as a consequence of returning TRUE from this function).
*/
static gboolean
free_all_fragments(gpointer key_arg _U_, gpointer value, gpointer user_data _U_)
{
fragment_data *fd_head, *tmp_fd;
- /* If Glib version => 2.10 we do g_hash_table_new_full() and supply a function
+ /* g_hash_table_new_full() was used to supply a function
* to free the key and the addresses.
*/
for (fd_head = value; fd_head != NULL; fd_head = tmp_fd) {
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index e9c8dcc5ca..1eff9a3b17 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -890,7 +890,7 @@ void
tcapsrt_init_routine(void)
{
- /* free hash-tables and mem_chunks for SRT */
+ /* free hash-table for SRT */
if (tcaphash_context != NULL) {
#ifdef DEBUG_TCAPSRT
dbg(16,"Destroy hash_context \n");
@@ -929,12 +929,12 @@ tcapsrt_init_routine(void)
#ifdef DEBUG_TCAPSRT
dbg(16,"Create hash \n");
#endif
- /* create new hash-tables and mem_chunks for SRT */
+ /* create new hash-tables for SRT */
tcaphash_context = g_hash_table_new(tcaphash_context_calchash, tcaphash_context_equal);
- tcaphash_begin = g_hash_table_new(tcaphash_begin_calchash, tcaphash_begin_equal);
- tcaphash_cont = g_hash_table_new(tcaphash_cont_calchash, tcaphash_cont_equal);
- tcaphash_end = g_hash_table_new(tcaphash_end_calchash, tcaphash_end_equal);
- tcaphash_ansi = g_hash_table_new(tcaphash_ansi_calchash, tcaphash_ansi_equal);
+ tcaphash_begin = g_hash_table_new(tcaphash_begin_calchash, tcaphash_begin_equal);
+ tcaphash_cont = g_hash_table_new(tcaphash_cont_calchash, tcaphash_cont_equal);
+ tcaphash_end = g_hash_table_new(tcaphash_end_calchash, tcaphash_end_equal);
+ tcaphash_ansi = g_hash_table_new(tcaphash_ansi_calchash, tcaphash_ansi_equal);
/* Reset the session counter */
tcapsrt_global_SessionId=1;
diff --git a/file.c b/file.c
index afbb674471..5ca617424e 100644
--- a/file.c
+++ b/file.c
@@ -134,11 +134,6 @@ static void ref_time_packets(capture_file *cf);
#define MIN_QUANTUM 200000
#define MIN_NUMBER_OF_PACKET 1500
-/* Number of "frame_data" structures per memory chunk.
- XXX - is this the right number? */
-#define FRAME_DATA_CHUNK_SIZE 1024
-
-
/*
* We could probably use g_signal_...() instead of the callbacks below but that
* would require linking our CLI programs to libgobject and creating an object