Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc

Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index 243af6a519..5b4fce15d4 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -341,7 +341,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset,
 
   /* byte name[MAXVLCELLCHARS];          Cell name */
   proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_ASCII|ENC_NA);
-  name = tvb_get_string (wmem_packet_scope(), tvb, offset, MAXVLCELLCHARS); /* XXX why 114 above and 128 here?? */
+  name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, MAXVLCELLCHARS, ENC_ASCII); /* XXX why 114 above and 128 here?? */
   offset += MAXVLCELLCHARS;	/* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
   col_append_fstr (pinfo->cinfo, COL_INFO, " Name: %s", name);
 
@@ -377,7 +377,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset,
     {
       proto_tree_add_item (tree, hf_fldb_vlconf_cell_hostname, tvb, offset,
 			     64, ENC_ASCII|ENC_NA);
-      hostname = tvb_get_string (wmem_packet_scope(), tvb, offset, 64);
+      hostname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII);
       offset += 64;		/* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
       col_append_fstr (pinfo->cinfo, COL_INFO, " hostName: %s", hostname);
     }
@@ -460,7 +460,7 @@ typedef [string] byte   NameString_t[AFS_NAMEMAX];
       proto_tree_add_item (tree,
 			     hf_fldb_afsNameString_t_principalName_string,
 			     tvb, offset, string_size, ENC_ASCII|ENC_NA);
-      namestring = tvb_get_string (wmem_packet_scope(), tvb, offset, string_size);
+      namestring = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, string_size, ENC_ASCII);
       offset += string_size;
 	col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", namestring);
     }
@@ -684,7 +684,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
 
   proto_tree_add_item (tree, hf_fldb_vldbentry_volumename, tvb, offset, 114,
 		       ENC_ASCII|ENC_NA);
-  volumename = tvb_get_string (wmem_packet_scope(), tvb, offset, 114);
+  volumename = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 114, ENC_ASCII);
   offset += 110;		/* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
     col_append_fstr (pinfo->cinfo, COL_INFO, " Name: %s", volumename);
 
@@ -746,7 +746,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
     {
       proto_tree_add_item (tree, hf_fldb_vldbentry_siteprincipal, tvb,
 			   offset, 64, ENC_ASCII|ENC_NA);
-      siteprincipal = tvb_get_string (wmem_packet_scope(), tvb, offset, 64);
+      siteprincipal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII);
       offset += 64;
 	col_append_fstr (pinfo->cinfo, COL_INFO, " Princ: %s", siteprincipal);
     }
@@ -908,14 +908,14 @@ dissect_vldbentry (tvbuff_t * tvb, int offset,
   /* byte            LockerName[MAXLOCKNAMELEN]; */
   proto_tree_add_item (tree, hf_fldb_vldbentry_lockername, tvb, offset,
 		       MAXLOCKNAMELEN, ENC_ASCII|ENC_NA);
-  lockername = tvb_get_string (wmem_packet_scope(), tvb, offset, MAXLOCKNAMELEN);
+  lockername = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, MAXLOCKNAMELEN, ENC_ASCII);
   offset += MAXLOCKNAMELEN;	/* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
     col_append_fstr (pinfo->cinfo, COL_INFO, " LockerName: %s", lockername);
 
   /*     byte            charSpares[50]; */
   proto_tree_add_item (tree, hf_fldb_vldbentry_charspares, tvb, offset, 50,
 		       ENC_ASCII|ENC_NA);
-  charspares = tvb_get_string (wmem_packet_scope(), tvb, offset, 50);
+  charspares = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 50, ENC_ASCII);
   offset += 50;			/* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */
     col_append_fstr (pinfo->cinfo, COL_INFO, " charSpares:%s", charspares);
 
@@ -1057,7 +1057,7 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t * tvb, int offset,
   offset += 48;			/* part of kerbprin before name... */
 
   proto_tree_add_item (tree, hf_fldb_namestring, tvb, offset, 64, ENC_ASCII|ENC_NA);
-  namestring = tvb_get_string (wmem_packet_scope(), tvb, offset, 64);
+  namestring = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII);
   offset += 64;
   col_append_fstr (pinfo->cinfo, COL_INFO, " %s", namestring);