diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-08 13:59:33 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-09 05:54:38 +0000 |
| commit | d296c75247b2b176e728cfdcf24a2f20d6fa2449 (patch) | |
| tree | a515dbc32a23073321dabe5b704e6b35db2cade1 /doc | |
| parent | 45cbdbc70a97d0fc4f05cc5a59e1f42fe6b124e5 (diff) | |
| download | wireshark-d296c75247b2b176e728cfdcf24a2f20d6fa2449.tar.gz | |
Some more random removal of ep_ memory.
Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
Reviewed-on: https://code.wireshark.org/review/6416
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.dissector | 12 | ||||
| -rw-r--r-- | doc/README.tapping | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/README.dissector b/doc/README.dissector index 3bbb342798..7a3f9ffab3 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -312,16 +312,16 @@ information). Byte Array Accessors: -gchar *tvb_bytes_to_str(tvbuff_t *tvb, gint offset, gint len); +gchar *tvb_bytes_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint len); Formats a bunch of data from a tvbuff as bytes, returning a pointer to the string with the data formatted as two hex digits for each byte. -The string pointed to is stored in an "ep_alloc'd" buffer which will be freed -before the next frame is dissected. The formatted string will contain the hex digits -for at most the first 16 bytes of the data. If len is greater than 16 bytes, a -trailing "..." will be added to the string. +The string pointed to is stored in an "wmem_alloc'd" buffer which will be freed +depending on its scope (typically wmem_packet_scope which is freed after the frame). +The formatted string will contain the hex digits for at most the first 16 bytes of +the data. If len is greater than 16 bytes, a trailing "..." will be added to the string. -gchar *tvb_bytes_to_str_punct(tvbuff_t *tvb, gint offset, gint len, gchar punct); +gchar *tvb_bytes_to_str_punct(wmem_allocator_t *scope, tvbuff_t *tvb, gint offset, gint len, gchar punct); This function is similar to tvb_bytes_to_str(...) except that 'punct' is inserted between the hex representation of each byte. diff --git a/doc/README.tapping b/doc/README.tapping index bc460a400c..75b99ac69c 100644 --- a/doc/README.tapping +++ b/doc/README.tapping @@ -197,7 +197,7 @@ tap_queue_packet() is using its own instance of private struct variable so they don't overwrite each other. See packet-ip.c which has a simple solution to the problem. It creates -a unique instance of the IP header using ep_alloc(). +a unique instance of the IP header using wmem_alloc(). Previous versions used a static struct of 4 instances of the IP header struct and cycled through them each time the dissector was called. (4 was just a number taken out of the blue but it should be enough for most |