aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbuff_composite.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-09-21 17:04:41 +0000
committerEvan Huus <eapache@gmail.com>2013-09-21 17:04:41 +0000
commit6df83e8078aafe6b6dfa03cf1abc33cde0f6612d (patch)
treee982807717a63c7dcf361f5166edda8156ddebf1 /epan/tvbuff_composite.c
parent8abfcaea798bba1c4d1db2092d94d3b6bc3e932f (diff)
Add _g_ to the names of functions that allocate glib memory. This is a bit more
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures that take the appropriate wmem pool. Majority of the conversion done with sed. svn path=/trunk/; revision=52164
Diffstat (limited to 'epan/tvbuff_composite.c')
-rw-r--r--epan/tvbuff_composite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c
index 62ca4fdefe..05032ddf80 100644
--- a/epan/tvbuff_composite.c
+++ b/epan/tvbuff_composite.c
@@ -116,7 +116,7 @@ composite_get_ptr(tvbuff_t *tvb, guint abs_offset, guint abs_length)
return tvb_get_ptr(member_tvb, member_offset, abs_length);
}
else {
- tvb->real_data = (guint8 *)tvb_memdup(tvb, 0, -1);
+ tvb->real_data = (guint8 *)tvb_g_memdup(tvb, 0, -1);
return tvb->real_data + abs_offset;
}