summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-aodv.c2
-rw-r--r--epan/dissectors/packet-aoe.c15
-rw-r--r--epan/dissectors/packet-aol.c3
-rw-r--r--epan/dissectors/packet-ap1394.c3
-rw-r--r--epan/dissectors/packet-app-pkix-cert.c3
-rw-r--r--epan/dissectors/packet-applemidi.c7
-rw-r--r--epan/dissectors/packet-aprs.c24
-rw-r--r--epan/dissectors/packet-ar_drone.c3
-rw-r--r--epan/dissectors/packet-arcnet.c3
-rw-r--r--epan/dissectors/packet-artnet.c3
-rw-r--r--epan/dissectors/packet-aruba-adp.c3
-rw-r--r--epan/dissectors/packet-aruba-erm.c3
-rw-r--r--epan/dissectors/packet-aruba-papi.c2
13 files changed, 55 insertions, 19 deletions
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index b3f90a1e3b..4ec809b165 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -50,6 +50,8 @@
* (both of the above two are draft-perkins-manet-aodv6-01.txt, which
* is from November 2000)
*/
+void proto_register_aodv(void);
+void proto_reg_handoff_aodv(void);
#define INET6_ADDRLEN 16
#define UDP_PORT_AODV 654
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 556a9aaa1f..f1393b70cc 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -28,6 +28,9 @@
#include <epan/conversation.h>
#include <etypes.h>
+void proto_register_aoe(void);
+void proto_reg_handoff_aoe(void);
+
static int proto_aoe;
static int hf_aoe_version=-1;
static int hf_aoe_flags_response=-1;
@@ -193,7 +196,7 @@ ata_cmd_equal_matched(gconstpointer k1, gconstpointer k2)
static guint
ata_cmd_hash_unmatched(gconstpointer k)
{
- const ata_info_t *key = k;
+ const ata_info_t *key = (const ata_info_t *)k;
return key->tag;
}
@@ -201,8 +204,8 @@ ata_cmd_hash_unmatched(gconstpointer k)
static gint
ata_cmd_equal_unmatched(gconstpointer k1, gconstpointer k2)
{
- const ata_info_t *key1 = k1;
- const ata_info_t *key2 = k2;
+ const ata_info_t *key1 = (const ata_info_t *)k1;
+ const ata_info_t *key2 = (const ata_info_t *)k2;
return (key1->tag==key2->tag)&&(key1->conversation==key2->conversation);
}
@@ -224,7 +227,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
ata_info_t *tmp_ata_info;
/* first time we see this request so add a struct for request/response
matching */
- ata_info=se_alloc(sizeof(ata_info_t));
+ ata_info=se_new(ata_info_t);
ata_info->tag=tag;
ata_info->conversation=conversation;
ata_info->request_frame=pinfo->fd->num;
@@ -232,7 +235,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
ata_info->cmd=tvb_get_guint8(tvb, offset+3);
ata_info->req_time=pinfo->fd->abs_ts;
- tmp_ata_info=g_hash_table_lookup(ata_cmd_unmatched, ata_info);
+ tmp_ata_info=(ata_info_t *)g_hash_table_lookup(ata_cmd_unmatched, ata_info);
if(tmp_ata_info){
g_hash_table_remove(ata_cmd_unmatched, tmp_ata_info);
}
@@ -243,7 +246,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
a request */
tmp_ata_info.tag=tag;
tmp_ata_info.conversation=conversation;
- ata_info=g_hash_table_lookup(ata_cmd_unmatched, &tmp_ata_info);
+ ata_info=(ata_info_t *)g_hash_table_lookup(ata_cmd_unmatched, &tmp_ata_info);
/* woo hoo we could, so no need to store this in unmatched any more,
move both request and response to the matched table */
if(ata_info){
diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c
index 2032421cff..09ccb18611 100644
--- a/epan/dissectors/packet-aol.c
+++ b/epan/dissectors/packet-aol.c
@@ -34,6 +34,9 @@
#include "packet-tcp.h"
+void proto_register_aol(void);
+void proto_reg_handoff_aol(void);
+
/* AOL's port */
#define AOL_PORT 5190
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index 96393015db..b3712e65e6 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -32,6 +32,9 @@
#include "packet-ap1394.h"
#include <epan/etypes.h>
+void proto_register_ap1394(void);
+void proto_reg_handoff_ap1394(void);
+
static int proto_ap1394 = -1;
static int hf_ap1394_dst = -1;
static int hf_ap1394_src = -1;
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index fbd8c2e6f1..7732e8b6fc 100644
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.c
@@ -37,6 +37,9 @@
#include <epan/dissectors/packet-x509af.h>
+void proto_register_cert(void);
+void proto_reg_handoff_cert(void);
+
/* Initialize the protocol and registered fields */
static int proto_cert = -1;
diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c
index 82edb45ed6..2603d89e6b 100644
--- a/epan/dissectors/packet-applemidi.c
+++ b/epan/dissectors/packet-applemidi.c
@@ -56,6 +56,9 @@
#include "packet-rtp.h"
+void proto_register_applemidi(void);
+void proto_reg_handoff_applemidi(void);
+
/* Definitions for protocol name during dissector-register */
#define APPLEMIDI_DISSECTOR_NAME "Apple Network-MIDI Session Protocol"
#define APPLEMIDI_DISSECTOR_SHORTNAME "AppleMIDI"
@@ -300,11 +303,11 @@ dissect_applemidi_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
/* set dynamic payload-type 97 which is used by Apple for their RTP-MIDI implementation for this
address/port-tuple to cause RTP-dissector to call the RTP-MIDI-dissector for payload-decoding */
- encoding_name_and_rate = se_alloc( sizeof( encoding_name_and_rate_t ) );
+ encoding_name_and_rate = se_new(encoding_name_and_rate_t);
rtp_dyn_payload = g_hash_table_new( g_int_hash, g_int_equal );
encoding_name_and_rate->encoding_name = se_strdup( "rtp-midi" );
encoding_name_and_rate->sample_rate = 10000;
- key = se_alloc( sizeof( gint ) );
+ key = se_new(gint);
*key = 97;
g_hash_table_insert( rtp_dyn_payload, key, encoding_name_and_rate );
rtp_add_address( pinfo, &pinfo->src, pinfo->srcport, 0, APPLEMIDI_DISSECTOR_SHORTNAME,
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index 92496a28f3..085ab45068 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -54,6 +54,8 @@
#define AX25_ADDR_LEN 7 /* length of an AX.25 address */
#define STRLEN 100
+void proto_register_aprs(void);
+
/* Initialize the protocol and registered fields */
static int proto_aprs = -1;
@@ -692,23 +694,23 @@ dissect_mic_e( tvbuff_t *tvb,
proto_tree *mic_e_tree;
int new_offset;
int data_len;
- char *info_buffer;
- char latitude[7] = { '?', '?', '?', '?', '.', '?', '?' };
+ char *info_buffer;
+ char latitude[7] = { '?', '?', '?', '?', '.', '?', '?' };
int msg_a;
int msg_b;
int msg_c;
- char n_s;
+ char n_s;
int long_offset;
- char w_e;
+ char w_e;
int cse;
int spd;
- guint8 ssid;
+ guint8 ssid;
const mic_e_dst_code_table_s *dst_code_entry;
data_len = tvb_length_remaining( tvb, offset );
new_offset = offset + data_len;
- info_buffer = ep_alloc( STRLEN );
+ info_buffer = (char *)ep_alloc( STRLEN );
msg_a = 0;
msg_b = 0;
@@ -851,11 +853,11 @@ dissect_aprs_storm( tvbuff_t *tvb,
{
proto_tree *tc;
int data_len;
- char *info_buffer;
+ char *info_buffer;
static const char *storm_format = " (%*.*s)";
data_len = tvb_length_remaining( tvb, offset );
- info_buffer = ep_alloc( STRLEN );
+ info_buffer = (char *)ep_alloc( STRLEN );
g_snprintf( info_buffer, STRLEN, storm_format, data_len, data_len, tvb_get_ptr( tvb, offset, data_len ) );
tc = proto_tree_add_string( parent_tree, hf_aprs_storm_idx, tvb, offset, data_len, info_buffer );
storm_tree = proto_item_add_subtree( tc, ett_aprs_storm_idx );
@@ -904,7 +906,7 @@ dissect_aprs_weather( tvbuff_t *tvb,
data_len = tvb_length_remaining( tvb, offset );
new_offset = offset + data_len;
- info_buffer = ep_alloc( STRLEN );
+ info_buffer = (char *)ep_alloc( STRLEN );
g_snprintf( info_buffer, STRLEN, weather_format, data_len, data_len, tvb_get_ptr( tvb, offset, data_len ) );
tc = proto_tree_add_string( parent_tree, hf_aprs_weather_idx, tvb, offset, data_len, info_buffer );
@@ -1063,7 +1065,7 @@ aprs_latitude_compressed( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
char *info_buffer;
int temp;
- info_buffer = ep_alloc( STRLEN );
+ info_buffer = (char *)ep_alloc( STRLEN );
temp = ( tvb_get_guint8( tvb, offset + 0 ) - 33 );
temp = ( tvb_get_guint8( tvb, offset + 1 ) - 33 ) + ( temp * 91 );
@@ -1084,7 +1086,7 @@ aprs_longitude_compressed( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
char *info_buffer;
int temp;
- info_buffer = ep_alloc( STRLEN );
+ info_buffer = (char *)ep_alloc( STRLEN );
temp = ( tvb_get_guint8( tvb, offset + 0 ) - 33 );
temp = ( tvb_get_guint8( tvb, offset + 1 ) - 33 ) + ( temp * 91 );
diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c
index 3198cc222e..11dc673897 100644
--- a/epan/dissectors/packet-ar_drone.c
+++ b/epan/dissectors/packet-ar_drone.c
@@ -34,6 +34,9 @@
#include <epan/prefs.h>
#include <epan/expert.h>
+void proto_register_ar_drone(void);
+void proto_reg_handoff_ar_drone(void);
+
static guint ar_drone_port = 0;
/* ************************************************ */
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 156661e72e..16c7491214 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -32,6 +32,9 @@
#include <epan/arcnet_pids.h>
#include "packet-ip.h"
+void proto_register_arcnet(void);
+void proto_reg_handoff_arcnet(void);
+
/* Initialize the protocol and registered fields */
static int proto_arcnet = -1;
static int hf_arcnet_src = -1;
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index 71d52b6018..b93311f368 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -36,6 +36,9 @@
* http://www.artisticlicence.com/art-net.pdf
*/
+void proto_register_artnet(void);
+void proto_reg_handoff_artnet(void);
+
/* Define udp_port for ArtNET */
#define UDP_PORT_ARTNET 0x1936
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 7ad9e8aa30..8ced3a5e45 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -34,6 +34,9 @@
#define ADP_REQUEST 1
#define ADP_RESPONSE 2
+void proto_register_aruba_adp(void);
+void proto_reg_handoff_aruba_adp(void);
+
static int proto_aruba_adp = -1;
static gint ett_aruba_adp = -1;
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index 889799ad3a..5b887a2be8 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -48,6 +48,9 @@
#define PROTO_SHORT_NAME "ARUBA_ERM"
#define PROTO_LONG_NAME "ARUBA encapsulated remote mirroring"
+void proto_register_aruba_erm(void);
+void proto_reg_handoff_aruba_erm(void);
+
static range_t *global_aruba_erm_port_range;
static int proto_aruba_erm = -1;
diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c
index eafec4ec3b..9ce6be41f9 100644
--- a/epan/dissectors/packet-aruba-papi.c
+++ b/epan/dissectors/packet-aruba-papi.c
@@ -41,6 +41,8 @@
/* This is not IANA assigned nor registered */
#define UDP_PORT_PAPI 8211
+void proto_register_aruba_papi(void);
+void proto_reg_handoff_aruba_papi(void);
/* Initialize the protocol and registered fields */
static int proto_papi = -1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-31 12:12:14 +0000