diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-21 02:10:19 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-21 02:10:19 +0000 |
| commit | 794757ae8fbee85db2b24bc46b7e9cc492de01df (patch) | |
| tree | a955184a13d8444bdec0de9200f261c46cfa2734 /epan/dissectors/packet-gift.c | |
| parent | 449d732485da5a19b8a0d3ddef49ed30498712ff (diff) | |
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.
svn path=/trunk/; revision=39503
Diffstat (limited to 'epan/dissectors/packet-gift.c')
| -rw-r--r-- | epan/dissectors/packet-gift.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index da497fb678..cda1dfd896 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -14,12 +14,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -69,14 +69,14 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) line = tvb_get_ptr(tvb, offset, linelen); /* set "Info" column text */ - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", is_request ? "Request" : "Response", format_text(line, linelen)); /* if tree != NULL, build protocol tree */ if (tree) { - ti = proto_tree_add_item(tree, proto_gift, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_gift, tvb, 0, -1, ENC_NA); gift_tree = proto_item_add_subtree(ti, ett_gift); if (is_request) { @@ -86,7 +86,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } PROTO_ITEM_SET_HIDDEN(hidden_item); - ti = proto_tree_add_text(gift_tree, tvb, offset, next_offset - offset, "%s", + ti = proto_tree_add_text(gift_tree, tvb, offset, next_offset - offset, "%s", tvb_format_text(tvb, offset, next_offset - offset)); cmd_tree = proto_item_add_subtree(ti, ett_gift_cmd); |