aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-02-26 14:25:38 -0800
committerGuy Harris <guy@alum.mit.edu>2014-02-26 22:28:48 +0000
commit46d8abe2521137d8a21b83a53f22a32287a98c08 (patch)
tree636637bfb763cbd07176bd92ea9801511eb14d9d /epan
parentdf77e26485b9c46ee397ef2fc49f9f8ee3488431 (diff)
Document tvb_memdup() in more detail.
Change-Id: Iec94342b7d033fb6e8597bbffea563128182316b Reviewed-on: https://code.wireshark.org/review/417 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
-rw-r--r--epan/tvbuff.h19
1 files changed, 15 insertions, 4 deletions
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 21270bda17..0d4c5ca796 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -371,10 +371,21 @@ WS_DLL_PUBLIC guint32 tvb_get_bits(tvbuff_t *tvb, const guint bit_offset,
WS_DLL_PUBLIC void *tvb_memcpy(tvbuff_t *tvb, void *target, const gint offset,
size_t length);
-/** If scope is set to NULL it is the user's responsibility to wmem_free()
- * the memory allocated by tvb_memdup(). Otherwise memory is
- * automatically freed when the scope lifetime is reached.
- * Calls tvb_memcpy() */
+/** Given an allocator scope, a tvbuff, a byte offset, a byte length:
+ *
+ * allocate a buffer using the specified scope;
+ *
+ * copy the data from the tvbuff specified by the offset and length
+ * into that buffer, using tvb_memcpy();
+ *
+ * and return a pointer to the buffer.
+ *
+ * Throws an exception if the tvbuff ends before the data being copied does.
+ *
+ * If scope is set to NULL it is the user's responsibility to wmem_free()
+ * the memory allocated. Otherwise memory is automatically freed when the
+ * scope lifetime is reached.
+ */
WS_DLL_PUBLIC void *tvb_memdup(wmem_allocator_t *scope, tvbuff_t *tvb,
const gint offset, size_t length);