Fix various warnings
Move packet-cops.c out of clean dissectors due to a #define conflict in the headers of net-snmp with our config.h svn path=/trunk/; revision=21398
This commit is contained in:
Stephen Fisher
parent
5f5f656108
commit
f002ac6db5
|
|
@ -43,6 +43,7 @@ libdissectors_la_SOURCES = \
|
|||
if HAVE_WARNINGS_AS_ERRORS
|
||||
AM_CLEAN_CFLAGS = -Werror
|
||||
endif
|
||||
|
||||
libcleandissectors_la_SOURCES = \
|
||||
$(CLEAN_DISSECTOR_SRC)
|
||||
libcleandissectors_la_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -239,7 +239,6 @@ CLEAN_DISSECTOR_SRC = \
|
|||
packet-clip.c \
|
||||
packet-clnp.c \
|
||||
packet-componentstatus.c \
|
||||
packet-cops.c \
|
||||
packet-cosine.c \
|
||||
packet-cpfi.c \
|
||||
packet-cpha.c \
|
||||
|
|
@ -737,6 +736,7 @@ CLEAN_DISSECTOR_SRC = \
|
|||
DISSECTOR_SRC = \
|
||||
packet-bacapp.c \
|
||||
packet-ber.c \
|
||||
packet-cops.c \
|
||||
packet-diameter.c \
|
||||
packet-h248_3gpp.c \
|
||||
packet-h263.c \
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
{
|
||||
tvbuff_t *wlan_tvb;
|
||||
proto_tree *ti, *cwids_tree;
|
||||
int offset = 0;
|
||||
volatile int offset = 0;
|
||||
guint16 capturelen;
|
||||
guint remain;
|
||||
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
|
|||
static int ehdr_num=0;
|
||||
proto_tree *volatile tree;
|
||||
proto_item *addr_item;
|
||||
proto_tree *addr_tree=NULL;
|
||||
proto_tree *volatile addr_tree=NULL;
|
||||
|
||||
ehdr_num++;
|
||||
if(ehdr_num>=4){
|
||||
|
|
|
|||
|
|
@ -172,13 +172,14 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
{
|
||||
proto_item *item;
|
||||
proto_tree *subtree;
|
||||
int return_offset = 0;
|
||||
volatile int return_offset = 0;
|
||||
gssapi_conv_info_t *volatile gss_info;
|
||||
gssapi_oid_value *oidvalue;
|
||||
dissector_handle_t handle;
|
||||
conversation_t *conversation;
|
||||
tvbuff_t *oid_tvb;
|
||||
int len, offset, start_offset, oid_start_offset;
|
||||
int len, start_offset, oid_start_offset;
|
||||
volatile int offset;
|
||||
gint8 class;
|
||||
gboolean pc, ind_field;
|
||||
gint32 tag;
|
||||
|
|
@ -186,7 +187,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
const char *oid;
|
||||
fragment_data *fd_head=NULL;
|
||||
gssapi_frag_info_t *fi;
|
||||
tvbuff_t *gss_tvb=NULL;
|
||||
tvbuff_t *volatile gss_tvb=NULL;
|
||||
|
||||
start_offset=0;
|
||||
offset=0;
|
||||
|
|
|
|||
|
|
@ -5825,10 +5825,10 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo,
|
|||
proto_tree *temp_tree = NULL;
|
||||
volatile gboolean run_req_cond = FALSE;
|
||||
volatile gboolean run_info_str = FALSE;
|
||||
guint32 length_remaining;
|
||||
guint32 testvar;
|
||||
unsigned long except_code;
|
||||
const char *message;
|
||||
guint32 length_remaining;
|
||||
guint32 testvar;
|
||||
volatile unsigned long except_code;
|
||||
const char *volatile message;
|
||||
|
||||
func = tvb_get_guint8(tvb, 6);
|
||||
|
||||
|
|
|
|||
|
|
@ -246,9 +246,11 @@ static const value_string scsi_feature_val[] = {
|
|||
};
|
||||
|
||||
static void
|
||||
dissect_mmc4_getconfiguration (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
||||
guint offset, gboolean isreq, gboolean iscdb,
|
||||
guint payload_len _U_, scsi_task_data_t *cdata _U_)
|
||||
dissect_mmc4_getconfiguration (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
|
||||
proto_tree *tree, volatile guint offset,
|
||||
gboolean isreq, gboolean iscdb,
|
||||
guint payload_len _U_,
|
||||
scsi_task_data_t *cdata _U_)
|
||||
|
||||
{
|
||||
guint8 flags;
|
||||
|
|
|
|||
|
|
@ -2036,9 +2036,10 @@ dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
|
|||
}
|
||||
|
||||
void
|
||||
dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
||||
guint offset, gboolean isreq, gboolean iscdb,
|
||||
guint32 payload_len, scsi_task_data_t *cdata)
|
||||
dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo,
|
||||
proto_tree *tree, volatile guint offset, gboolean isreq,
|
||||
gboolean iscdb, guint32 payload_len,
|
||||
scsi_task_data_t *cdata)
|
||||
{
|
||||
guint8 flags, i;
|
||||
static const int *peripheal_fields[] = {
|
||||
|
|
@ -3798,9 +3799,10 @@ proto_tree *tree _U_,
|
|||
}
|
||||
|
||||
void
|
||||
dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
||||
guint offset, gboolean isreq, gboolean iscdb,
|
||||
guint payload_len _U_, scsi_task_data_t *cdata _U_)
|
||||
dissect_spc_reportluns (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
|
||||
proto_tree *tree, volatile guint offset,
|
||||
gboolean isreq, gboolean iscdb, guint payload_len _U_,
|
||||
scsi_task_data_t *cdata _U_)
|
||||
{
|
||||
guint8 flags;
|
||||
gint listlen;
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin
|
|||
tvbuff_t *volatile tvb = 0;
|
||||
wcp_window_t *buf_ptr = 0;
|
||||
wcp_pdata_t *volatile pdata_ptr;
|
||||
gboolean bounds_error = FALSE;
|
||||
volatile gboolean bounds_error = FALSE;
|
||||
|
||||
buf_ptr = get_wcp_window_ptr( pinfo);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue