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 /asn1 | |
| parent | 8abfcaea798bba1c4d1db2092d94d3b6bc3e932f (diff) | |
| download | wireshark-6df83e8078aafe6b6dfa03cf1abc33cde0f6612d.tar.gz | |
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 'asn1')
| -rw-r--r-- | asn1/c1222/packet-c1222-template.c | 8 | ||||
| -rw-r--r-- | asn1/ldap/ldap.cnf | 2 | ||||
| -rw-r--r-- | asn1/t124/t124.cnf | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index e2617f89ff..4e5113cc97 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -301,11 +301,11 @@ static uat_t *c1222_uat; #define FILL_START int length, start_offset = offset; #define FILL_TABLE(fieldname) \ length = offset - start_offset; \ - fieldname = (guint8 *)tvb_memdup(tvb, start_offset, length); \ + fieldname = (guint8 *)tvb_g_memdup(tvb, start_offset, length); \ fieldname##_len = length; #define FILL_TABLE_TRUNCATE(fieldname, len) \ length = 1 + 2*(offset - start_offset); \ - fieldname = (guint8 *)tvb_memdup(tvb, start_offset, length); \ + fieldname = (guint8 *)tvb_g_memdup(tvb, start_offset, length); \ fieldname##_len = len; #else /* HAVE_LIBGCRYPT */ #define FILL_TABLE(fieldname) @@ -919,7 +919,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ return offset; encrypted = TRUE; if (c1222_decrypt) { - buffer = (guchar *)tvb_memdup(tvb, offset, len2); + buffer = (guchar *)tvb_g_memdup(tvb, offset, len2); if (!decrypt_packet(buffer, len2, TRUE)) { g_free(buffer); crypto_bad = TRUE; @@ -938,7 +938,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ len2 = tvb_length_remaining(tvb, offset); if (len2 <= 0) return offset; - buffer = (guchar *)tvb_memdup(tvb, offset, len2); + buffer = (guchar *)tvb_g_memdup(tvb, offset, len2); epsem_buffer = tvb_new_subset_remaining(tvb, offset); if (c1222_decrypt) { if (!decrypt_packet(buffer, len2, FALSE)) { diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index c1d76ce015..43e36dc115 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -194,7 +194,7 @@ char *mechanism = NULL; * different type and/or mechanism. */ if(!actx->pinfo->fd->flags.visited) { - mechanism = tvb_get_string(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0)); + mechanism = tvb_get_g_string(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0)); ldap_info->first_auth_frame = 0; /* not known until we see the bind reply */ /* * If the mechanism in this request is an empty string (which is diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index 0153e43385..a49e3820e0 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -154,7 +154,7 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult if(next_tvb) { - ns = tvb_get_string(t124NSIdentifier, 0, tvb_length(t124NSIdentifier)); + ns = tvb_get_g_string(t124NSIdentifier, 0, tvb_length(t124NSIdentifier)); if(ns != NULL) { dissector_try_string(t124_ns_dissector_table, ns, next_tvb, actx->pinfo, top_tree); g_free(ns); |