Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:

 1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).




git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 9 insertions, 9 deletions

diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 25e8de1917..b8e8a2aedc 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -130,9 +130,9 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     switch (rsync_frame_data_p->state) {
     case RSYNC_INIT:
-	proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, ENC_ASCII|ENC_NA);
 	offset += 8;
-	proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, ENC_ASCII|ENC_NA);
 	tvb_get_nstringz0(tvb, offset, sizeof(version), version);
 	offset += 4;
 
@@ -148,9 +148,9 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	break;
     case RSYNC_SERV_INIT:
-	proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, ENC_ASCII|ENC_NA);
 	offset += 8;
-	proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_hdr_version, tvb, offset, 4, ENC_ASCII|ENC_NA);
 	tvb_get_nstringz0(tvb, offset, sizeof(version), version);
 	offset += 4;
 
@@ -166,7 +166,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	break;
     case RSYNC_CLIENT_QUERY:
-	proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_query_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
         col_append_str(pinfo->cinfo, COL_INFO, "Client Query");
 
@@ -174,7 +174,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 	break;
     case RSYNC_SERV_MOTD:
-	proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, TRUE);
+	proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
         col_append_str(pinfo->cinfo, COL_INFO, "Server MOTD");
 
@@ -187,14 +187,14 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	if (0 == strncmp("@RSYNCD:", auth_string, 8)) {
 	  /* matches, so we assume its an authentication message */
 	  /* needs to handle the AUTHREQD case, but doesn't - FIXME */
-	  proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, TRUE);
+	  proto_tree_add_item(rsync_tree, hf_rsync_rsyncdok_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
 	  col_append_str(pinfo->cinfo, COL_INFO, "Authentication");
 	  conversation_data->state = RSYNC_COMMAND;
 
 	} else { /*  it didn't match, so it is probably a module list */
 
-	  proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, TRUE);
+	  proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
 	  col_append_str(pinfo->cinfo, COL_INFO, "Module list");
 
@@ -214,7 +214,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     case RSYNC_COMMAND:
         if (pinfo->destport == glb_rsync_tcp_port) {
 	  /* then we are still sending commands */
-	  proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, TRUE);
+	  proto_tree_add_item(rsync_tree, hf_rsync_command_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
 	  col_append_str(pinfo->cinfo, COL_INFO, "Command");