summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2014-03-17 16:54:08 +0100
committerAnders Broman <a.broman58@gmail.com>2014-03-17 15:57:55 +0000
commitce527ba58d6b2b0d760fc996c895b2415d61ceea (patch)
treeafeaa6e209c2431090a50b5b4ab7b4cc50a1e9c1
parentaea1edfe0d2dc52c341ca4e638f759be8e3ca8ec (diff)
downloadwireshark-ce527ba58d6b2b0d760fc996c895b2415d61ceea.tar.gz
Try to fix trivial varnings
Change-Id: I7b09999fe34ffded73f0b26c3e561b39d2120643 Reviewed-on: https://code.wireshark.org/review/714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-amqp.c3
-rw-r--r--epan/dissectors/packet-btle.h2
-rw-r--r--epan/dissectors/packet-hdmi.c1
-rw-r--r--epan/dissectors/packet-openflow_v5.c6
-rw-r--r--epan/dissectors/packet-osc.c3
-rw-r--r--epan/dissectors/packet-pdc.c30
6 files changed, 28 insertions, 17 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 6f90165b85..404c72f545 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -44,6 +44,9 @@
#include <epan/wmem/wmem.h>
#include "packet-tcp.h"
+
+void proto_register_amqp(void);
+void proto_reg_handoff_amqp(void);
/* Generic data */
static int amqp_port = 5672;
diff --git a/epan/dissectors/packet-btle.h b/epan/dissectors/packet-btle.h
index 9d29d44346..2f113b6a04 100644
--- a/epan/dissectors/packet-btle.h
+++ b/epan/dissectors/packet-btle.h
@@ -47,7 +47,7 @@ typedef enum {
E_AA_NO_COMMENT = 0,
E_AA_MATCHED,
E_AA_BIT_ERRORS,
- E_AA_ILLEGAL,
+ E_AA_ILLEGAL
} btle_AA_category_t;
typedef struct {
diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c
index 54d87536d9..7decab1823 100644
--- a/epan/dissectors/packet-hdmi.c
+++ b/epan/dissectors/packet-hdmi.c
@@ -37,6 +37,7 @@
#include "packet-hdmi.h"
void proto_register_hdmi(void);
+void proto_reg_handoff_hdmi(void);
static int proto_hdmi = -1;
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c
index 67aaf2cff7..ff2944f99b 100644
--- a/epan/dissectors/packet-openflow_v5.c
+++ b/epan/dissectors/packet-openflow_v5.c
@@ -3893,7 +3893,7 @@ dissect_openflow_queue_desc_request_v5(tvbuff_t *tvb, packet_info *pinfo _U_, pr
proto_tree_add_item(tree, hf_openflow_v5_queue_desc_request_queue_id_reserved, tvb, offset, 4, ENC_BIG_ENDIAN);
}
/*offset+=4;*/
-};
+}
#define OFPFMF_INITIAL 1<<0
@@ -4133,7 +4133,7 @@ dissect_openflow_switch_description_v5(tvbuff_t *tvb, packet_info *pinfo _U_, pr
/* char dp_desc[DESC_STR_LEN]; */
proto_tree_add_item(tree, hf_openflow_v5_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA);
/*offset+=DESC_STR_LEN;*/
-};
+}
static int
@@ -4361,7 +4361,7 @@ dissect_openflow_port_stats_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
offset+=4;
return offset;
-};
+}
diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c
index 6616c8ccac..9edc481eb2 100644
--- a/epan/dissectors/packet-osc.c
+++ b/epan/dissectors/packet-osc.c
@@ -35,6 +35,9 @@
#include <epan/conversation.h>
#include <epan/exceptions.h>
+void proto_register_osc(void);
+void proto_reg_handoff_osc(void);
+
/* Open Sound Control (OSC) argument types enumeration */
typedef enum _OSC_Type {
OSC_INT32 = 'i',
diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c
index 592da3ae63..89fbd1a74f 100644
--- a/epan/dissectors/packet-pdc.c
+++ b/epan/dissectors/packet-pdc.c
@@ -29,6 +29,10 @@
#include <epan/dissectors/packet-tcp.h>
#include <epan/reassemble.h>
+
+void proto_register_pdc(void);
+void proto_reg_handoff_pdc(void);
+
/*PDC Protocol*/
#define PDC_PROCOTOL "PDC"
@@ -201,12 +205,12 @@ static int dissect_simpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, guint
} /* end of whileloop */
}
return (bytesProcessed);
-};
+}
static int dissect_rsmpdu(void)
{
return (0);
-};
+}
static int dissect_drmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
{
@@ -217,7 +221,7 @@ static int dissect_drmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
proto_tree_add_item(tree, hf_pdc_drmpdu_reason, tvb, offset + 1, 1, ENC_NA);
return (2);
-};
+}
static int dissect_admpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo)
{
@@ -245,7 +249,7 @@ static int dissect_admpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe
return (returnLen);
}
return (2);
-};
+}
static int dissect_dtmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo)
{
@@ -267,7 +271,7 @@ static int dissect_dtmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe
return (returnLen);
}
return (2);
-};
+}
static int dissect_edmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo)
{
@@ -289,7 +293,7 @@ static int dissect_edmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe
return (returnLen);
}
return 2;
-};
+}
static int dissect_akmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
{
@@ -297,7 +301,7 @@ static int dissect_akmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset)
proto_tree_add_item(tree, hf_pdc_akmpdu_cdt, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_pdc_yr_admu_nr, tvb, offset + 2, 4, ENC_BIG_ENDIAN);
return (6);
-};
+}
static int dissect_pdc_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo)
{
@@ -360,7 +364,7 @@ static int dissect_pdc_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf
break;
};
return (length);
-};
+}
/* Actual dissector bits and bytes done here */
static int dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
@@ -376,7 +380,7 @@ static int dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
}
return tvb_length(tvb);
-};
+}
/* function to provide TCP split packet combiner with size of packet */
static guint get_pdc_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
@@ -420,7 +424,7 @@ static guint get_pdc_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offs
extra=0;
}
return (guint)(size+extra);
-};
+}
/* top level call to recombine split tcp packets */
@@ -457,7 +461,7 @@ static void tcp_dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
}
tcp_dissect_pdus(tvb, pinfo, tree, TRUE, minimum_bytes, get_pdc_message_len, dissect_pdc, NULL);
-};
+}
/* function to register pdc dissector and get handle for asterix dissector */
void proto_reg_handoff_pdc(void)
@@ -467,7 +471,7 @@ void proto_reg_handoff_pdc(void)
asterix_handle = find_dissector("asterix");
pdc_handle = create_dissector_handle(tcp_dissect_pdc, proto_pdc);
dissector_add_uint("tcp.port", gPREF_PORT_NUM_TCP, pdc_handle);
-};
+}
void proto_register_pdc(void)
{
@@ -520,7 +524,7 @@ void proto_register_pdc(void)
/*Register Preferences*/
prefs_register_uint_preference(pdc_pref_module, "tcp.port", "PDC Port", "PDC Port if other then the default", 10, &gPREF_PORT_NUM_TCP);
-};
+}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html