Corrected some types.

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

diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 6ce5434025cdc1603ae81d13f5a8b4421d45fb68..e46ea0d48250852b9b106818f8e35af1437cf997 100644 (file)
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -86,7 +86,7 @@ static const value_string  k12_port_types[] = {
 };
 
 static void
-fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint length)
+fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length)
 {
        guint adj = 0;
                        /* 0x11=control frame 0x30=data frame */

diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index a121131e89771c92be3a1f49832c68645ab4c2f8..4b9e39473b8c3776674ae08936c169e33ef7c5a6 100644 (file)
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -107,15 +107,15 @@ static gint proto_tpncp = -1,
 static gint ett_tpncp = -1,
             ett_tpncp_body = -1;
 
-static gint global_tpncp_trunkpack_tcp_port = TCP_PORT_TPNCP_TRUNKPACK,
-            global_tpncp_trunkpack_udp_port = UDP_PORT_TPNCP_TRUNKPACK,
-            global_tpncp_host_tcp_port = TCP_PORT_TPNCP_HOST,
-            global_tpncp_host_udp_port = UDP_PORT_TPNCP_HOST;
+static guint global_tpncp_trunkpack_tcp_port = TCP_PORT_TPNCP_TRUNKPACK,
+             global_tpncp_trunkpack_udp_port = UDP_PORT_TPNCP_TRUNKPACK,
+             global_tpncp_host_tcp_port = TCP_PORT_TPNCP_HOST,
+             global_tpncp_host_udp_port = UDP_PORT_TPNCP_HOST;
 
-static gint trunkpack_tcp_port = 0,
-            trunkpack_udp_port = 0,
-            host_tcp_port = 0,
-            host_udp_port = 0;
+static guint trunkpack_tcp_port = 0,
+             trunkpack_udp_port = 0,
+             host_tcp_port = 0,
+             host_udp_port = 0;
 
 static value_string tpncp_commands_id_vals[MAX_TPNCP_DB_SIZE];
 static value_string tpncp_events_id_vals[MAX_TPNCP_DB_SIZE];
@@ -334,7 +334,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item,
 /*-------------------------------------------------------------------------------------------------------------------------------------------*/
 
 static void dissect_tpncp_event(gint event_id, tvbuff_t *tvb,
-                                proto_item *item, gint *offset) {
+                                proto_item *item, guint *offset) {
     switch (event_id) {
         /* Place non-standard events here. */
         default:
@@ -346,7 +346,7 @@ static void dissect_tpncp_event(gint event_id, tvbuff_t *tvb,
 /*-------------------------------------------------------------------------------------------------------------------------------------------*/
 
 static void dissect_tpncp_command(gint command_id, tvbuff_t *tvb,
-                                  proto_item *item, gint *offset) {
+                                  proto_item *item, guint *offset) {
     switch (command_id) {
         /* Place non-standard commands here. */
         default:

diff --git a/wiretap/ascend.c b/wiretap/ascend.c
index 23ff63d7fbbfd0327b9c9b4f8ad908629926a48a..66fbd6dcd50be8c4320adc556c5967df4ff84c63 100644 (file)
--- a/wiretap/ascend.c
+++ b/wiretap/ascend.c
@@ -173,7 +173,7 @@ int ascend_open(wtap *wth, int *err, gchar **err_info _U_)
   struct stat statbuf;
   guint8 buf[ASCEND_MAX_PKT_LEN];
   ascend_pkthdr header;
-  guint64 dummy_seek_start;
+  gint64 dummy_seek_start;
 
   /* We haven't yet allocated a data structure for our private stuff;
      set the pointer to null, so that "ascend_seek()" knows not to