diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
| commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
| tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-9p.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
Diffstat (limited to 'epan/dissectors/packet-9p.c')
| -rw-r--r-- | epan/dissectors/packet-9p.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index f99db251f3..d942636e83 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -1273,7 +1273,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_tree_add_item(sub_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN); if (firstpass) { - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); if (!strncmp(tvb_s, "9P2000.L", _9p_len)) { u32 = _9P2000_L; @@ -1363,7 +1363,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void sub_tree = proto_item_add_subtree(ti, ett_9P_aname); proto_tree_add_item(sub_tree, hf_9P_parmsz, tvb, offset, 2, ENC_LITTLE_ENDIAN); if(firstpass) { - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); conv_set_fid(pinfo, fid, tvb_s, _9p_len+1); g_free(tvb_s); } @@ -1409,7 +1409,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } if (firstpass) { - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); wmem_strbuf_append_c(tmppath, '/'); wmem_strbuf_append(tmppath, tvb_s); g_free(tvb_s); @@ -1484,7 +1484,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, fid_path); wmem_strbuf_append_c(tmppath, '/'); - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); wmem_strbuf_append(tmppath, tvb_s); g_free(tvb_s); } @@ -1519,7 +1519,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void tmppath = wmem_strbuf_sized_new(wmem_packet_scope(), 0, MAXPATHLEN); wmem_strbuf_append(tmppath, fid_path); wmem_strbuf_append_c(tmppath, '/'); - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); wmem_strbuf_append(tmppath, tvb_s); g_free(tvb_s); } @@ -1935,7 +1935,7 @@ static int dissect_9P(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void wmem_strbuf_append(tmppath, conv_get_fid(pinfo, dfid)); wmem_strbuf_append_c(tmppath, '/'); - tvb_s = tvb_get_g_string(tvb, offset+2, _9p_len); + tvb_s = tvb_get_string(NULL, tvb, offset+2, _9p_len); wmem_strbuf_append(tmppath, tvb_s); g_free(tvb_s); |