Remove some no-longer-needed casts.

svn path=/trunk/; revision=28081

4 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 1b9da0a433..87fe2572bb 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -429,7 +429,7 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p
 
 	display_name = tvb_get_ephemeral_string(tvb, offset, length);
 	proto_item_append_text(display_item, ": \"%s\"",
-	        format_text(display_name, (int)strlen(display_name)));
+	        format_text(display_name, strlen(display_name)));
 	proto_tree_add_string(display_tree, hf_edp_display_string, tvb, offset, length,
 		display_name);
 }
@@ -620,7 +620,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot
 
 	vlan_name = tvb_get_ephemeral_string(tvb, offset, length);
 	proto_item_append_text(vlan_item, ", Name \"%s\"",
-	        format_text(vlan_name, (int)strlen(vlan_name)));
+	        format_text(vlan_name, strlen(vlan_name)));
 	proto_tree_add_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length,
 		vlan_name);
 	offset += length;
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 1dd4f73cf9..c25c66726d 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -376,7 +376,7 @@ static const value_string vals_response_status[] = {
     { 0xE9, "Permanent: Reply charging not supported" },
     /* MMS 1.2 */
     { 0xEA, "Permanent: Address hiding not supported" },
-    
+
     { 0x00, NULL },
 };
 
@@ -398,7 +398,7 @@ static const value_string vals_message_status[] = {
     { 0x86, "Forwarded" },
     /* MMS 1.2 */
     { 0x87, "Unreachable" },
-    
+
     { 0x00, NULL },
 };
 
@@ -460,7 +460,7 @@ get_text_string(tvbuff_t *tvb, guint offset, const char **strval)
 {
     guint	 len;
 
-    DebugLog(("get_text_string(tvb = %p, offset = %u, **strval) - start\n", 
+    DebugLog(("get_text_string(tvb = %p, offset = %u, **strval) - start\n",
 		tvb, offset));
     len = tvb_strsize(tvb, offset);
     DebugLog((" [1] tvb_strsize(tvb, offset) == %u\n", len));
@@ -724,7 +724,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
      * columns must be set appropriately too.
      * If tree != NULL then we also want to display the protocol tree
      * with its fields.
-     * 
+     *
      * In the interest of speed, skip protocol tree item generation
      * if tree is NULL.
      */
@@ -1166,7 +1166,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 		    /* Value-length Integer-value Encoded-string-value */
 		    length = get_value_length(tvb, offset, &count);
 		    if (tree) {
-			guint32 fwd_count, count1, count2;			
+			guint32 fwd_count, count1, count2;
 			proto_tree *subtree = NULL;
 			proto_item *ti = NULL;
 			/* 1. Forwarded-count-value := Integer-value */
@@ -1180,7 +1180,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 				hf_mmse_prev_sent_by,
 				tvb, offset - 1, 1 + count + length,
 				strval, "%s (Forwarded-count=%u)",
-				format_text(strval, (int)strlen(strval)),
+				format_text(strval, strlen(strval)),
 				fwd_count);
 			subtree = proto_item_add_subtree(ti,
 				ett_mmse_hdr_details);
@@ -1197,7 +1197,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 		    /* Value-Length Forwarded-count-value Date-value */
 		    length = get_value_length(tvb, offset, &count);
 		    if (tree) {
-			guint32 fwd_count, count1, count2;			
+			guint32 fwd_count, count1, count2;
 			guint		 tval;
 			nstime_t	 tmptime;
 			proto_tree *subtree = NULL;
@@ -1217,7 +1217,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 				hf_mmse_prev_sent_date,
 				tvb, offset - 1, 1 + count + length,
 				strval, "%s (Forwarded-count=%u)",
-				format_text(strval, (int)strlen(strval)),
+				format_text(strval, strlen(strval)),
 				fwd_count);
 			subtree = proto_item_add_subtree(ti,
 				ett_mmse_hdr_details);
@@ -1256,7 +1256,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 				proto_tree_add_text(mmse_tree, tvb, offset - 1,
 					length + 1, "%s: %s (Not decoded)",
 					hdr_name,
-					format_text(strval, (int)strlen(strval)));
+					format_text(strval, strlen(strval)));
 			    }
 			} else { /* General form with length */
 			    if (peek == 0x1F) { /* Value length in guintvar */
@@ -1292,8 +1292,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
 				    (const char *) tvb_get_ptr(
 					    tvb, offset, length + length2),
 				    "%s: %s",
-				    format_text(strval, (int)strlen(strval)),
-				    format_text(strval2, (int)strlen(strval2)));
+				    format_text(strval, strlen(strval)),
+				    format_text(strval2, strlen(strval2)));
 			}
 			offset += length + length2;
 		    }
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 24e2d26531..6acabfc7b0 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -2626,7 +2626,7 @@ server_entry(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset)
     aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Server Info");
     atree = proto_item_add_subtree(aitem, ett_ndps);
     foffset = ndps_string(tvb, hf_ndps_server_name, ndps_tree, foffset, &server_name);
-    proto_item_append_text(aitem, ": %s", format_text(server_name, (int)strlen(server_name)));
+    proto_item_append_text(aitem, ": %s", format_text(server_name, strlen(server_name)));
     proto_tree_add_item(atree, hf_ndps_server_type, tvb, foffset, 4, FALSE);
     foffset += 4;
     foffset = print_address(tvb, atree, foffset);
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 36a1dcfefe..78cc165eff 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -883,7 +883,7 @@ dissect_tds7_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				len *= 2;
 				proto_tree_add_text(login_tree, tvb, offset2, len, "%s: %s", val_to_str(i, login_field_names, "Unknown"), val);
 			} else {
-				/* This field is the password.  We retrieve it from the packet 
+				/* This field is the password.  We retrieve it from the packet
 				 * as a non-unicode string and then perform two operations on it
 				 * to "decrypt" it.  Finally, we create a new string that consists
 				 * of ASCII characters instead of unicode by skipping every other
@@ -1259,7 +1259,7 @@ dissect_tds_err_token(tvbuff_t *tvb, guint offset, guint token_sz _U_, proto_tre
 	} else {
 		msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, msg_len);
 	}
-	proto_tree_add_text(tree, tvb, offset, msg_len, "Error: %s", format_text((guchar*)msg, (int)strlen(msg)));
+	proto_tree_add_text(tree, tvb, offset, msg_len, "Error: %s", format_text((guchar*)msg, strlen(msg)));
 	offset += msg_len;
 
 	srvr_len = tvb_get_guint8(tvb, offset);
@@ -1324,7 +1324,7 @@ dissect_tds_login_ack_token(tvbuff_t *tvb, guint offset, guint token_sz, proto_t
 	} else {
 		msg = (gchar*)tvb_get_ephemeral_string(tvb, offset, msg_len);
 	}
-	proto_tree_add_text(tree, tvb, offset, msg_len, "Text: %s", format_text((guchar*)msg, (int)strlen(msg)));
+	proto_tree_add_text(tree, tvb, offset, msg_len, "Text: %s", format_text((guchar*)msg, strlen(msg)));
 	offset += msg_len;
 
 	proto_tree_add_text(tree, tvb, offset, 4, "Server Version");