Fix some fussy warnings seen on the Ubuntu buildbot logs

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

diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index ebfecd001cb6764e401bb9bc483b1898e3e984c3..3c089d732160b1742c5f8f58881b9e010d238e90 100644 (file)
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -280,6 +280,9 @@ static const value_string server_to_client_error_vals[] =
 
 /*************************/
 /* Function declarations */
+void proto_register_msmms(void);
+void proto_reg_handoff_msmms_command(void);
+
 static gint dissect_msmms_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
 static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
@@ -442,7 +445,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     offset += 4;
 
     /* Protocol name.  Must be "MMS"... */
-    if (strncmp(tvb_get_ephemeral_string(tvb, offset, 3), "MMS", 3) != 0)
+    if (strncmp((char*)tvb_get_ephemeral_string(tvb, offset, 3), "MMS", 3) != 0)
     {
         return 0;
     }
@@ -793,7 +796,7 @@ void dissect_client_transport_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)",
-                        format_text(transport_info, length_remaining - 20));
+                        format_text((guchar*)transport_info, length_remaining - 20));
     }
 
 
@@ -898,7 +901,7 @@ void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         if (check_col(pinfo->cinfo, COL_INFO))
         {
             col_append_fstr(pinfo->cinfo, COL_INFO, " (version='%s')",
-                           format_text(server_version, server_version_length));
+                        format_text((guchar*)server_version, server_version_length));
         }
     }
     offset += (server_version_length*2);
@@ -912,7 +915,7 @@ void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         /* Server version string */
         proto_tree_add_string(tree, hf_msmms_command_tool_version, tvb,
                               offset, tool_version_length*2,
-                              format_text(tool_version, tool_version_length));
+                              format_text((guchar*)tool_version, tool_version_length));
     }
     offset += (tool_version_length*2);
 
@@ -965,7 +968,7 @@ void dissect_client_player_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
     if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)",
-                        format_text(player_info, (length_remaining - 12)/2));
+                        format_text((guchar*)player_info, (length_remaining - 12)/2));
     }
 }
 
@@ -1061,7 +1064,7 @@ void dissect_request_server_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
     if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)",
-                        format_text(server_file, (length_remaining - 16)/2));
+                        format_text((guchar*)server_file, (length_remaining - 16)/2));
     }
 }
 

diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index dea335d86af0753ba99e208068136f4ca2a056b9..863b611a5e9beb93415cf4fab10e376830ab6254 100644 (file)
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -177,7 +177,7 @@ static guint    global_rdt_udp_port = 6970;
 static gboolean  rdt_register_udp_port = FALSE;
 static guint     rdt_udp_port = 0;
 
-
+void proto_register_rdt(void);
 void proto_reg_handoff_rdt(void);
 
 /* Main dissection function */
@@ -1326,7 +1326,7 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 /* Save this conversation info into packet info */
                 p_conv_packet_data = se_alloc(sizeof(struct _rdt_conversation_info));
                 g_snprintf(p_conv_packet_data->method, MAX_RDT_SETUP_METHOD_SIZE, "%s", p_conv_data->method);
-               p_conv_packet_data->method[MAX_RDT_SETUP_METHOD_SIZE]=0;
+                p_conv_packet_data->method[MAX_RDT_SETUP_METHOD_SIZE]=0;
                 p_conv_packet_data->frame_number = p_conv_data->frame_number;
                 p_conv_packet_data->feature_level = p_conv_data->feature_level;
                 p_add_proto_data(pinfo->fd, proto_rdt, p_conv_packet_data);