diff options
author | Evan Huus <eapache@gmail.com> | 2013-09-21 17:04:41 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-09-21 17:04:41 +0000 |
commit | 6df83e8078aafe6b6dfa03cf1abc33cde0f6612d (patch) | |
tree | e982807717a63c7dcf361f5166edda8156ddebf1 /epan/dissectors/packet-dcerpc-spoolss.c | |
parent | 8abfcaea798bba1c4d1db2092d94d3b6bc3e932f (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/dissectors/packet-dcerpc-spoolss.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 1133642b24..899140db53 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -700,7 +700,7 @@ dissect_printerdata_data(tvbuff_t *tvb, int offset, switch(type) { case DCERPC_REG_SZ: { - char *data = tvb_get_unicode_string(tvb, offset - size, size, ENC_LITTLE_ENDIAN); + char *data = tvb_get_g_unicode_string(tvb, offset - size, size, ENC_LITTLE_ENDIAN); proto_item_append_text(item, ": %s", data); @@ -1099,7 +1099,7 @@ dissect_spoolss_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, return offset; } - text = tvb_get_unicode_string(tvb, offset, remaining, ENC_LITTLE_ENDIAN); + text = tvb_get_g_unicode_string(tvb, offset, remaining, ENC_LITTLE_ENDIAN); len = (int)strlen(text); proto_tree_add_text(tree, tvb, offset, len * 2, "%s: %s", @@ -5908,7 +5908,7 @@ cb_notify_str_postprocess(packet_info *pinfo _U_, len = tvb_get_letohl(tvb, start_offset); - s = tvb_get_unicode_string( + s = tvb_get_g_unicode_string( tvb, start_offset + 4, (end_offset - start_offset - 4), ENC_LITTLE_ENDIAN); /* Append string to upper-level proto_items */ |