osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Data sources have a lifetime spanning a single packet 

so instead for g-alloc and g_free   data
just use ep_alloc() that is automatically freed instead.

this also gets rid of one more GMemChunk



svn path=/trunk/; revision=15346
This commit is contained in:
Ronnie Sahlberg 2005-08-14 00:26:56 +00:00
parent f8d286b7e3
commit 88f1cd4201
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/packet.c
View File

@ -183,9 +183,6 @@ postseq_cleanup_all_protocols(void)
&call_postseq_cleanup_routine, NULL);
}
/* Contains information about data sources. */
static GMemChunk *data_source_chunk = NULL;
/*
* Add a new data source to the list of data sources for a frame, given
* the tvbuff for the data source and its name.
@ -195,19 +192,14 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name)
{
data_source *src;
if (data_source_chunk == NULL) {
data_source_chunk = g_mem_chunk_new("data_source_chunk",
sizeof (data_source), 10 * sizeof (data_source),
G_ALLOC_AND_FREE);
}
src = g_mem_chunk_alloc(data_source_chunk);
src = ep_alloc(sizeof (data_source));
src->tvb = tvb;
/*
* XXX - if we require this argument to be a string constant,
* we don't need to allocate a buffer for a copy and make a
* copy, and wouldn't need to free the buffer, either.
*/
src->name = g_strdup_printf("%s (%u bytes)", name, tvb_length(tvb));
src->name = ep_strdup_printf("%s (%u bytes)", name, tvb_length(tvb));
pinfo->data_src = g_slist_append(pinfo->data_src, src);
}
@ -217,14 +209,6 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name)
void
free_data_sources(packet_info *pinfo)
{
GSList *src_le;
data_source *src;
for (src_le = pinfo->data_src; src_le != NULL; src_le = src_le->next) {
src = src_le->data;
g_free(src->name);
g_mem_chunk_free(data_source_chunk, src);
}
g_slist_free(pinfo->data_src);
pinfo->data_src = NULL;
}