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, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c
index 869d8a7947..7faed73596 100644
--- a/epan/dissectors/packet-mrcpv2.c
+++ b/epan/dissectors/packet-mrcpv2.c
@@ -473,35 +473,35 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         sp_end = tvb_find_guint8(tvb, 0, linelen, ' ');
         if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen))
             return -1;
-        field1 = tvb_get_string(wmem_packet_scope(), tvb, 0, sp_end);
+        field1 = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, sp_end, ENC_ASCII);
         sp_start = sp_end + 1;
 
         /* length */
         sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' ');
         if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen))
             return -1;
-        field2 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start);
+        field2 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII);
         sp_start = sp_end + 1;
 
         /* method, request ID or event */
         sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' ');
         if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen))
             return -1;
-        field3 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start);
+        field3 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII);
         sp_start = sp_end + 1;
 
         /* request ID or status code */
         sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' ');
         if (sp_end == -1)
         {
-            field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, linelen - sp_start);
+            field4 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, linelen - sp_start, ENC_ASCII);
             line_type = REQUEST_LINE; /* only request line has 4 parameters */
         }
         else
         {
             if ((sp_end > tvb_len) || (sp_end > linelen))
                 return -1;
-            field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start);
+            field4 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII);
 
             if (isdigit(field3[0])) /* request ID is number, so it has to be response */
                 line_type = RESPONSE_LINE;
@@ -512,7 +512,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             sp_end = linelen;
             if ((sp_end > tvb_len) || (sp_end > linelen))
                 return -1;
-            field5 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start);
+            field5 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII);
         }
 
         /* check pdu size */
@@ -641,10 +641,10 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA);
                 continue;
             }
-            header_name = tvb_get_string(wmem_packet_scope(), tvb, offset, colon_offset - offset);
+            header_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, colon_offset - offset, ENC_ASCII);
             ascii_strdown_inplace(header_name);
             value_offset = tvb_skip_wsp(tvb, colon_offset + 1, offset + linelen - (colon_offset + 1));
-            header_value = tvb_get_string(wmem_packet_scope(), tvb, value_offset, offset + linelen - value_offset);
+            header_value = tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset, offset + linelen - value_offset, ENC_ASCII);
 
             /* find out header type */
             header_type = UNKNOWN;
@@ -979,9 +979,9 @@ get_mrcpv2_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
     /* second string is message length */
     len_end = tvb_find_guint8(tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start, ' ');
     if (len_end == -1)
-        msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start);
+        msg_len = tvb_get_string_enc(wmem_packet_scope(), tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start, ENC_ASCII);
     else
-        msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, len_end - len_start);
+        msg_len = tvb_get_string_enc(wmem_packet_scope(), tvb, len_start, len_end - len_start, ENC_ASCII);
 
     num_msg_len = atoi(msg_len);
     return num_msg_len;
@@ -1014,7 +1014,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
     slash_offset = tvb_find_guint8(tvb, 0, MRCPV2_MIN_LENGTH, '/');
     if (slash_offset != 4)
         return 0;
-    version = tvb_get_string(wmem_packet_scope(), tvb, 0, slash_offset);
+    version = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, slash_offset, ENC_ASCII);
     if (strcmp(version, "MRCP") != 0)
         return 0;
 
@@ -1025,7 +1025,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
     value_size = dot_offset - slash_offset - 1;
     if ((value_size != 1) && (value_size != 2))
         return 0;
-    major = tvb_get_string(wmem_packet_scope(), tvb, slash_offset + 1, dot_offset - 1);
+    major = tvb_get_string_enc(wmem_packet_scope(), tvb, slash_offset + 1, dot_offset - 1, ENC_ASCII);
     value = atoi(major);
     if (value != 2)
         return 0;
@@ -1034,12 +1034,12 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
     sp_offset = tvb_find_guint8(tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1, ' ');
     if (sp_offset == -1)
     {
-        minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1);
+        minor = tvb_get_string_enc(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1, ENC_ASCII);
         len = MRCPV2_MIN_LENGTH;
     }
     else
     {
-        minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1);
+        minor = tvb_get_string_enc(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1, ENC_ASCII);
         len = sp_offset;
     }
     value = atoi(minor);