aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-23 12:44:50 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-23 12:44:50 +0000
commit88aa5794ccc83d7814ff9faf2a68cc72f615cfbf (patch)
tree6d5b212c4723d04dd71ac10e16d4083639650d19
parentc341d18fd2e030d9585620ab34e49b778fa1e664 (diff)
Removed some "initializer does not fit or is out of range" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27826 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/dissectors/packet-dplay.c2
-rw-r--r--epan/dissectors/packet-ff.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c2
-rw-r--r--epan/dissectors/packet-ipars.c2
-rw-r--r--epan/dissectors/packet-kdp.c6
-rw-r--r--epan/dissectors/packet-netsync.c2
-rw-r--r--epan/dissectors/packet-rtmpt.c4
7 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index b1864a0a83..f88f94186e 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -1011,7 +1011,7 @@ static gint dissect_type2f_message(proto_tree *tree, tvbuff_t *tvb, gint offset)
static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint16 message_type;
- guint16 second_message_type = -1;
+ guint16 second_message_type = G_MAXUINT16;
guint16 proto_version;
guint16 packet_size;
guint32 dplay_id;
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 8527ec6e43..de79ea6f79 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -10556,7 +10556,7 @@ dissect_ff_msg_lr_get_statistics_rsp(
{
proto_tree *sub_tree = NULL;
proto_item *ti = NULL;
- guint32 NumXcableStat = -1;
+ guint32 NumXcableStat;
if(check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index c4b76aec14..2801202329 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -6998,7 +6998,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
#define PROTECTION_ALG_CCMP 2
#define PROTECTION_ALG_RSNA PROTECTION_ALG_CCMP | PROTECTION_ALG_TKIP
#endif
- guint8 algorithm=-1;
+ guint8 algorithm=G_MAXUINT8;
/* Davide Schiera (2006-11-27): added macros to check the algorithm */
/* used could be TKIP or CCMP */
#define IS_TKIP(tvb, hdr_len) (tvb_get_guint8(tvb, hdr_len + 1) & 0x20)
diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index 1486e36230..37371d8951 100644
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -38,7 +38,7 @@
#include <epan/emem.h>
static int proto_ipars = -1;
-static guint8 ipars_eomtype = -1;
+static guint8 ipars_eomtype = G_MAXUINT8;
static gint ett_ipars = -1;
#define S1 (0x00)
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index 073924e2de..da26eb9141 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -78,9 +78,9 @@ static void dissect_kdp(tvbuff_t *tvb,
guint8 header_len = 0;
guint8 packet_flags = 0;
guint8 packet_errors = 0;
- guint32 sequence_number = -1;
- guint32 ack_number = -1;
- guint32 src_flowid = -1;
+ guint32 sequence_number = G_MAXUINT32;
+ guint32 ack_number = G_MAXUINT32;
+ guint32 src_flowid = G_MAXUINT32;
int offset;
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index a5edd929b7..068c124c05 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -371,7 +371,7 @@ static gint dissect_netsync_cmd_send_delta(tvbuff_t *tvb, gint offset, proto_tr
static gint dissect_netsync_cmd_data(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_)
{
- guint len = -1;
+ guint len = 0;
proto_tree_add_item(tree, hf_netsync_cmd_data_type, tvb,
offset, 1, FALSE );
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index b962128a2d..55630a65a0 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -194,7 +194,7 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
struct tcpinfo* tcpinfo = pinfo->private_data;
static gint iPreviousFrameNumber = -1;
- guint16 iCommand = -1;
+ guint16 iCommand = G_MAXUINT16;
guint16 iLength = 1;
guint16 iHeaderType = 4;
guint16 iHeaderLength;
@@ -391,7 +391,7 @@ get_rtmpt_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
{
guint16 iHeaderType;
guint8 iID;
- guint16 iCommand = -1;
+ guint16 iCommand = G_MAXUINT16;
iID = tvb_get_guint8(tvb, offset + 0);
iHeaderType = iID >> 6;