diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
| commit | b38ee917b1953104c615056481d6df008ae94b53 (patch) | |
| tree | 55024f9c53f083dc056540b6d887fc4550064008 /epan/dissectors/packet-portmap.c | |
| parent | a17cf67635c6e190c174bc131707804edca5c8f4 (diff) | |
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.
The script didn't catch as many as I would have liked, but it's a start.
The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.
svn path=/trunk/; revision=52045
Diffstat (limited to 'epan/dissectors/packet-portmap.c')
| -rw-r--r-- | epan/dissectors/packet-portmap.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index a8d6bf7997..9d7b642c67 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -92,8 +92,8 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* program */ prog = tvb_get_ntohl(tvb, offset+0); prog_name = rpc_prog_name(prog); - proto_tree_add_uint_format(tree, hf_portmap_prog, tvb, - offset, 4, prog, "Program: %s (%u)", + proto_tree_add_uint_format_value(tree, hf_portmap_prog, tvb, + offset, 4, prog, "%s (%u)", prog_name, prog); col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%u)", prog_name, prog); @@ -175,8 +175,8 @@ dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if ( tree ) { prog = tvb_get_ntohl(tvb, offset+0); - proto_tree_add_uint_format(tree, hf_portmap_prog, tvb, - offset, 4, prog, "Program: %s (%d)", + proto_tree_add_uint_format_value(tree, hf_portmap_prog, tvb, + offset, 4, prog, "%s (%d)", rpc_prog_name(prog), prog); proto_tree_add_item(tree, hf_portmap_version, tvb, offset+4, 4, ENC_BIG_ENDIAN); @@ -203,8 +203,8 @@ dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if ( tree ) { prog = tvb_get_ntohl(tvb, offset+0); - proto_tree_add_uint_format(tree, hf_portmap_prog, tvb, - offset, 4, prog, "Program: %s (%d)", + proto_tree_add_uint_format_value(tree, hf_portmap_prog, tvb, + offset, 4, prog, "%s (%d)", rpc_prog_name(prog), prog); proto_tree_add_item(tree, hf_portmap_version, tvb, offset+4, 4, ENC_BIG_ENDIAN); @@ -247,14 +247,14 @@ dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, rpc_prog_name(prog), prog, version); subtree = proto_item_add_subtree(ti, ett_portmap_entry); - proto_tree_add_uint_format(subtree, hf_portmap_prog, tvb, + proto_tree_add_uint_format_value(subtree, hf_portmap_prog, tvb, offset+0, 4, prog, - "Program: %s (%u)", rpc_prog_name(prog), prog); + "%s (%u)", rpc_prog_name(prog), prog); proto_tree_add_uint(subtree, hf_portmap_version, tvb, offset+4, 4, version); - proto_tree_add_uint_format(subtree, hf_portmap_proto, tvb, + proto_tree_add_uint_format_value(subtree, hf_portmap_proto, tvb, offset+8, 4, proto, - "Protocol: %s (0x%02x)", ipprotostr(proto), proto); + "%s (0x%02x)", ipprotostr(proto), proto); proto_tree_add_uint(subtree, hf_portmap_port, tvb, offset+12, 4, port); } @@ -281,8 +281,8 @@ dissect_callit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, prog = tvb_get_ntohl(tvb, offset+0); if ( tree ) { - proto_tree_add_uint_format(tree, hf_portmap_prog, tvb, - offset, 4, prog, "Program: %s (%u)", + proto_tree_add_uint_format_value(tree, hf_portmap_prog, tvb, + offset, 4, prog, "%s (%u)", rpc_prog_name(prog), prog); } @@ -296,8 +296,8 @@ dissect_callit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proc = tvb_get_ntohl(tvb, offset+8); if ( tree ) { - proto_tree_add_uint_format(tree, hf_portmap_proc, tvb, - offset+8, 4, proc, "Procedure: %s (%u)", + proto_tree_add_uint_format_value(tree, hf_portmap_proc, tvb, + offset+8, 4, proc, "%s (%u)", rpc_proc_name(prog, vers, proc), proc); } @@ -403,9 +403,9 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree prog = tvb_get_ntohl(tvb, offset); if (rpcb_tree) - proto_tree_add_uint_format(rpcb_tree, hf_portmap_rpcb_prog, tvb, + proto_tree_add_uint_format_value(rpcb_tree, hf_portmap_rpcb_prog, tvb, offset, 4, prog, - "Program: %s (%u)", rpc_prog_name(prog), prog); + "%s (%u)", rpc_prog_name(prog), prog); offset += 4; offset = dissect_rpc_uint32(tvb, rpcb_tree, |