from Peter Johansson:

compilation warnings fixed

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

diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 45516fcbc4d2f8bccdc28bd2ec01792d77f1ef80..6810b0399ad44ef690e17df849ad5b463822a30c 100644 (file)
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -3976,11 +3976,10 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree      *ipmi_tree = NULL, *field_tree = NULL;
        proto_item      *ti = NULL, *tf;
        gint                    offset = 0;
-       gint                    auth_offset = 0;
        /* tvbuff_t     *next_tvb; */  /* modified by lane */
        guint32         session_id;
        /*payloadtype for RMCPP*/
-       guint8          authtype, payloadtype = 0, netfn, cmd, ccode, len, response;
+       guint8          authtype, payloadtype = 0, netfn, cmd, ccode, len, response, auth_offset = 0;
        gboolean        payloadtype_auth, payloadtype_enc = 0;
 
        /* session authtype, 0=no authcode present */

diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index f79619c13bbdb0d419cbe1ebaa35286eb6703df9..112e48538ef4c75a1f6743d960d48b8d478c375e 100644 (file)
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -1156,27 +1156,27 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        case OSPF_HELLO:
            dissect_ospf_hello(tvb, ospf_header_length, ospf_tree, version,
-                           ospflen - ospf_header_length);
+                           (guint16)(ospflen - ospf_header_length));
            break;
 
        case OSPF_DB_DESC:
-           dissect_ospf_db_desc(tvb, ospf_header_length, ospf_tree, version,
-                           ospflen - ospf_header_length);
+           dissect_ospf_db_desc(tvb, (int)ospf_header_length, ospf_tree, version,
+                           (guint16)(ospflen - ospf_header_length));
            break;
 
        case OSPF_LS_REQ:
-           dissect_ospf_ls_req(tvb, ospf_header_length, ospf_tree, version,
-                           ospflen - ospf_header_length);
+           dissect_ospf_ls_req(tvb, (int)ospf_header_length, ospf_tree, version,
+                           (guint16)(ospflen - ospf_header_length));
            break;
 
        case OSPF_LS_UPD:
-           dissect_ospf_ls_upd(tvb, ospf_header_length, ospf_tree, version,
-                           ospflen - ospf_header_length);
+           dissect_ospf_ls_upd(tvb, (int)ospf_header_length, ospf_tree, version,
+                           (guint16)(ospflen - ospf_header_length));
            break;
 
        case OSPF_LS_ACK:
-           dissect_ospf_ls_ack(tvb, ospf_header_length, ospf_tree, version,
-                           ospflen - ospf_header_length);
+           dissect_ospf_ls_ack(tvb, (int)ospf_header_length, ospf_tree, version,
+                           (guint16)(ospflen - ospf_header_length));
            break;
 
        default:

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 387c12b31e2bd3895a4134efd7493cd4c8f20a2f..78486aa396aa2a3aa1b1522a7499da742f96d0bd 100644 (file)
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -4646,7 +4646,7 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     /* If this PDU already contains all the expected data we dont have to do
      * reassembly.
      */
-    if( (!relative_offset) && (tvb_length_remaining(tvb, offset)==expected_length) ){
+    if( (!relative_offset) && ((guint32)tvb_length_remaining(tvb, offset) == expected_length) ){
         goto dissect_the_payload;
     }
 

diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 989e2da728b07d93fa07681bc16f906404eb8dff..ef29d466e5c97e67e7707da6718b6ab9236840c9 100644 (file)
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -15984,9 +15984,9 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
         * need to track it
         */
        if(!pinfo->fd->flags.visited && si->cmd==0x75 && !si->request){
-               offset=dissect_smb_tid(tvb, pinfo, htree, offset, si->tid, TRUE, FALSE);
+               offset=dissect_smb_tid(tvb, pinfo, htree, offset, (guint16)si->tid, TRUE, FALSE);
        } else {
-               offset=dissect_smb_tid(tvb, pinfo, htree, offset, si->tid, FALSE, FALSE);
+               offset=dissect_smb_tid(tvb, pinfo, htree, offset, (guint16)si->tid, FALSE, FALSE);
        }
 
        /* PID */