diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-01-18 20:02:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-01-18 20:02:19 +0000 |
| commit | f816511ea920660b935b0d574bb4f48249aaea0a (patch) | |
| tree | 8025f827c5e103d9de979ca71777bd16a8e4d488 /epan/emem.c | |
| parent | 4ecd261cfbe8977834e7e9b72c53513024770308 (diff) | |
In packet-cops.c use proto_item_append_text() instead of creating a
separate buffer. Fixes the current Buildbot failure.
Don't let the sprint_realloc_* functions reallocate ep_allocated memory.
Add comments warning against this in the future.
In emem.c, make sure we don't use an extra 100k every stinkin' time
someone wants to allocate memory when debugging is enabled.
Fixup whitespace.
svn path=/trunk/; revision=17051
Diffstat (limited to 'epan/emem.c')
| -rw-r--r-- | epan/emem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/emem.c b/epan/emem.c index 5e07410697..3498aac645 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -76,9 +76,11 @@ typedef struct _emem_chunk_t { unsigned int amount_free; unsigned int free_offset; char *buf; +#if ! defined(EP_DEBUG_FREE) && ! defined(SE_DEBUG_FREE) unsigned int c_count; void *canary[EMEM_ALLOCS_PER_CHUNK]; guint8 cmp_len[EMEM_ALLOCS_PER_CHUNK]; +#endif } emem_chunk_t; typedef struct _emem_header_t { |