[-Wmissing-prototypes]

Use explicit casts.

svn path=/trunk/; revision=48313

1 files changed, 9 insertions, 6 deletions

diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index 6b79359426..af62914706 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -33,6 +33,9 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 
+void proto_register_classicstun(void);
+void proto_reg_handoff_classicstun(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_classicstun                          = -1;
 
@@ -277,12 +280,12 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
     /*
      * Do we already have a state structure for this conv
      */
-    classicstun_info = conversation_get_proto_data(conversation, proto_classicstun);
+    classicstun_info = (classicstun_conv_info_t *)conversation_get_proto_data(conversation, proto_classicstun);
     if (!classicstun_info) {
         /* No.  Attach that information to the conversation, and add
          * it to the list of information structures.
          */
-        classicstun_info = se_alloc(sizeof(classicstun_conv_info_t));
+        classicstun_info = se_new(classicstun_conv_info_t);
         classicstun_info->pdus=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "classicstun_pdus");
         conversation_add_proto_data(conversation, proto_classicstun, classicstun_info);
     }
@@ -290,25 +293,25 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
     if(!pinfo->fd->flags.visited){
         if (((msg_type & CLASS_MASK) >> 4) == REQUEST) {
             /* This is a request */
-            classicstun_trans=se_alloc(sizeof(classicstun_transaction_t));
+            classicstun_trans=se_new(classicstun_transaction_t);
             classicstun_trans->req_frame=pinfo->fd->num;
             classicstun_trans->rep_frame=0;
             classicstun_trans->req_time=pinfo->fd->abs_ts;
             se_tree_insert32_array(classicstun_info->pdus, transaction_id_key,
                            (void *)classicstun_trans);
         } else {
-            classicstun_trans=se_tree_lookup32_array(classicstun_info->pdus,
+            classicstun_trans=(classicstun_transaction_t *)se_tree_lookup32_array(classicstun_info->pdus,
                                  transaction_id_key);
             if(classicstun_trans){
                 classicstun_trans->rep_frame=pinfo->fd->num;
             }
         }
     } else {
-        classicstun_trans=se_tree_lookup32_array(classicstun_info->pdus, transaction_id_key);
+        classicstun_trans=(classicstun_transaction_t *)se_tree_lookup32_array(classicstun_info->pdus, transaction_id_key);
     }
     if(!classicstun_trans){
         /* create a "fake" pana_trans structure */
-        classicstun_trans=ep_alloc(sizeof(classicstun_transaction_t));
+        classicstun_trans=ep_new(classicstun_transaction_t);
         classicstun_trans->req_frame=0;
         classicstun_trans->rep_frame=0;
         classicstun_trans->req_time=pinfo->fd->abs_ts;