Again, some warnings removed.

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

diff --git a/dftest.c b/dftest.c
index 474e7a8ece17a00e36a7291b760e6e9a41c3be3b..42a7cd5d1757ec8f563696d9615e8c6d46a27894 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -135,7 +135,7 @@ main(int argc, char **argv)
                epan_cleanup();
                exit(2);
        }
-       printf("dfilter ptr = 0x%08x\n", (unsigned int) df);
+       printf("dfilter ptr = 0x%08x\n", GPOINTER_TO_INT(df));
 
        printf("\n\n");
 

diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index a8e53b34f127a73b0de0e2d21f29491455ddeed8..5ce087c6ea883034c951ad129194f3ce5fc26607 100644 (file)
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -82,7 +82,7 @@ static int dissect_aim_chat_userinfo_list(tvbuff_t *tvb, packet_info *pinfo, pro
        return offset;
 }
 
-static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *chat_tree)
+static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *chat_tree _U_)
 {
        char buddyname[MAX_BUDDYNAME_LENGTH+1];
        guchar msg[1000];

diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 9f78399147f285c8c90cf261647708549bba9e5e..42f165cd4b73d8ef60500943553a25e5ab45acf7 100644 (file)
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -1010,7 +1010,7 @@ const aim_client_capability *aim_find_capability ( e_uuid_t clsid)
        return NULL;
 }
 
-int dissect_aim_tlv_value_capability_data ( proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb _U_, packet_info *pinfo _U_)
+int dissect_aim_tlv_value_capability_data ( proto_item *ti _U_, guint16 valueid _U_, tvbuff_t *tvb _U_, packet_info *pinfo _U_)
 {
        return 0;
 }

diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index db64740095b146f2bd0b3a291b3c090f508f03c1..d50f70ab93bdb9276549e25b084e05e3bda35a83 100644 (file)
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -470,6 +470,7 @@ proto_tree_add_bitfield8(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 mas
   return pi;
 }
 
+#if 0
 static proto_item *
 proto_tree_add_bitfield16(proto_tree *tree, tvbuff_t *tvb, int offset, guint16 mask) {
   /* XXX: Use varargs */
@@ -479,6 +480,7 @@ proto_tree_add_bitfield16(proto_tree *tree, tvbuff_t *tvb, int offset, guint16 m
                                       label);
  return pi;
 }
+#endif
 
 static guint8
 get_byte_offset(guint64 bo) {
@@ -956,7 +958,7 @@ translate_abqp_source_statistics_descriptor(guint8 value, build_info_t *bi) {
 }
 
 static char*
-translate_abqp_max_bit_rate_for_dl_extended(guint8 value, build_info_t *bi) {
+translate_abqp_max_bit_rate_for_dl_extended(guint8 value, build_info_t *bi _U_) {
   static char result[BSSGP_TRANSLATION_MAX_LEN];
 
   if (value == 0) {
@@ -971,7 +973,7 @@ translate_abqp_max_bit_rate_for_dl_extended(guint8 value, build_info_t *bi) {
 }
 
 static char*
-translate_abqp_guaranteed_bit_rate_for_dl_extended(guint8 value, build_info_t *bi) {
+translate_abqp_guaranteed_bit_rate_for_dl_extended(guint8 value, build_info_t *bi _U_) {
   static char result[BSSGP_TRANSLATION_MAX_LEN];
 
   if (value == 0) {
@@ -1053,6 +1055,7 @@ translate_msrac_extended_dtm_gprs_multislot_class(guint8 value, guint8 dgmsc) {
   return "Error"; /* Dummy */
 }
 
+#if 0
 static guint8
 translate_msrac_high_multislot_capability(guint8 capability, guint8 class) {
   switch (capability) {
@@ -1148,6 +1151,7 @@ translate_msrac_high_multislot_capability(guint8 capability, guint8 class) {
   g_assert_not_reached();
   return 0;
 }
+#endif
 
 static char*
 translate_channel_needed(guint8 value) {
@@ -1911,7 +1915,7 @@ decode_iei_location_area(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset)
 
 static void
 decode_msrac_additional_access_technologies(proto_tree *tree, tvbuff_t *tvb, 
-                                           guint64 bo, guint32 length) {
+                                           guint64 bo, guint32 length _U_) {
   proto_item *pi;
   guint8 value;
   guint8 bl; /* Bit length */
@@ -1959,7 +1963,7 @@ decode_msrac_access_capabilities(proto_tree *tree, tvbuff_t *tvb,
   proto_item *ti, *pi;
   proto_tree *tf;
   guint8 value, i;
-  guint8 dgmsc, demsc; /* DTM GPRS/EGPRS Multi Slot Class */
+  guint8 dgmsc = 0, demsc = 0; /* DTM GPRS/EGPRS Multi Slot Class */
   guint8 bl; /* Bit length */
   guint64 start_bo = bo;
 

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 204351fde0505d090b19e081829570118ea07a84..0ef1249eb2896748d6ac63c39d37bf86d8662d9c 100644 (file)
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -443,7 +443,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o
                        }                       
                        if(seq<tnp->nxtpdu && nxtseq>tnp->nxtpdu){
                                g_hash_table_insert(tcp_pdu_tracking_table, 
-                                       GINT_TO_POINTER(pinfo->fd->num), (void *)tnp->nxtpdu);
+                                       GINT_TO_POINTER(pinfo->fd->num), GUINT_TO_POINTER(tnp->nxtpdu));
                                offset+=tnp->nxtpdu-seq;
                                break;
                        }
@@ -478,7 +478,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o
                        return -1;
                }
 
-               pduseq=(guint32)g_hash_table_lookup(tcp_pdu_tracking_table, GINT_TO_POINTER(pinfo->fd->num));
+               pduseq=GPOINTER_TO_UINT(g_hash_table_lookup(tcp_pdu_tracking_table, GINT_TO_POINTER(pinfo->fd->num)));
                if(pduseq){
                        offset+=pduseq-seq;
                }

diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index cb2a130d7110eeb7bc4ba2c051a26643351c9b59..e4a9c77614abbb2823b6ef3a7f5b5ffea5a99854 100644 (file)
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -3072,7 +3072,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo,
                 */
                g_hash_table_insert(state->seqtable,
                                    GINT_TO_POINTER(state->sequencenumber), 
-                                   (int *)opcode);
+                                   GINT_TO_POINTER(opcode));
 
                break;
 
@@ -3083,7 +3083,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo,
                if (opcode >= X_FirstExtension && opcode <= X_LastExtension) {
                        g_hash_table_insert(state->seqtable,
                                            GINT_TO_POINTER(state->sequencenumber), 
-                                           (int *)opcode);
+                                           GINT_TO_POINTER(opcode));
                }
 
                /*
@@ -4566,8 +4566,8 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         */
 
        sequence_number = VALUE16(tvb, offset + 2);
-       opcode = (int)g_hash_table_lookup(state->seqtable,
-                                         GINT_TO_POINTER(sequence_number));
+       opcode = GPOINTER_TO_INT(g_hash_table_lookup(state->seqtable,
+                                         GINT_TO_POINTER(sequence_number)));
 
        if (state->iconn_frame == 0 &&  state->resync == FALSE) {