osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix signed/unsigned comparison warnings. 

svn path=/trunk/; revision=8084
This commit is contained in:
Gilbert Ramirez 2003-07-25 04:11:51 +00:00
parent 086774b71f
commit c91b8e713f
6 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/capture_dlg.c
View File

@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
* $Id: capture_dlg.c,v 1.78 2003/05/15 13:38:05 deniel Exp $
* $Id: capture_dlg.c,v 1.79 2003/07/25 04:11:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -900,10 +900,12 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
capture_opts.ringbuffer_num_files =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ringbuffer_nbf_sb));
if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
#if RINGBUFFER_MIN_NUM_FILES > 0
else if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
#endif
capture_opts.has_ring_duration =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_duration_cb));

10
gtk/main.c
View File

@ -1,6 +1,6 @@
/* main.c
*
* $Id: main.c,v 1.302 2003/07/19 10:25:59 oabad Exp $
* $Id: main.c,v 1.303 2003/07/25 04:11:51 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -2049,10 +2049,12 @@ main(int argc, char *argv[])
}
/* Check the value range of the ringbuffer_num_files parameter */
if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
#if RINGBUFFER_MIN_NUM_FILES > 0
else if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
#endif
#endif
rc_file = get_persconffile_path(RC_FILE, FALSE);

10
packet-ncp2222.inc
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) Gilbert Ramirez 2000-2002
* Portions Copyright (c) Novell, Inc. 2000-2003
*
* $Id: packet-ncp2222.inc,v 1.56 2003/07/21 09:21:53 guy Exp $
* $Id: packet-ncp2222.inc,v 1.57 2003/07/25 04:11:49 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1712,6 +1712,7 @@ print_nds_values(proto_tree *vtree, tvbuff_t *tvb, guint32 syntax_type, nds_val
guint16 rstate = 0;
guint16 rnum = 0;
guint16 revent = 0;
gint length_remaining;
voffset = vvalues->voffset;
if(tvb_get_guint8(tvb, voffset) == 0x00)
@ -1767,7 +1768,8 @@ print_nds_values(proto_tree *vtree, tvbuff_t *tvb, guint32 syntax_type, nds_val
case 0x00000009: /* Binary String */
case 0x00000015: /* Stream */
value1 = tvb_get_letohl(tvb, voffset); /* length of field */
if(value1 > tvb_length_remaining(tvb, voffset))
length_remaining = tvb_length_remaining(tvb, voffset);
if(length_remaining == -1 || value1 > (guint32) length_remaining)
{
break;
}
@ -2552,6 +2554,7 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, nds_val *values)
proto_item *sub1item;
proto_tree *sub2tree;
proto_item *sub2item;
gint length_remaining;
strcpy(mval_buf.buffer, "");
@ -3644,7 +3647,8 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, nds_val *values)
if(values->vflags != 5)
{
value1 = tvb_get_letohl(tvb, ioffset); /* length of field */
if(value1 > tvb_length_remaining(tvb, ioffset))
length_remaining = tvb_length_remaining(tvb, ioffset);
if(length_remaining == -1 || value1 > (guint32) length_remaining)
{
break;
}

16
packet-ndps.c
View File

@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2003
*
* $Id: packet-ndps.c,v 1.22 2003/06/04 08:38:09 guy Exp $
* $Id: packet-ndps.c,v 1.23 2003/07/25 04:11:49 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -3915,6 +3915,7 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g
guint32 profiles_choice_type;
guint32 integer_type_flag;
guint32 local_servers_type;
gint length_remaining;
proto_tree *atree;
proto_item *aitem;
proto_tree *btree;
@ -4046,7 +4047,8 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g
length = tvb_get_ntohl(tvb, foffset);
proto_tree_add_uint(btree, hf_ndps_included_doc_len, tvb, foffset, 4, length);
foffset += 4;
if (length > tvb_length_remaining(tvb, foffset)) /* Segmented Data */
length_remaining = tvb_length_remaining(tvb, foffset);
if (length_remaining == -1 || length > (guint32) length_remaining) /* Segmented Data */
{
proto_tree_add_item(btree, hf_ndps_data, tvb, foffset, -1, FALSE);
return;
@ -5579,7 +5581,8 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g
aitem = proto_tree_add_text(ndps_tree, tvb, foffset, -1, "Item %d", i);
atree = proto_item_add_subtree(aitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
if(tvb_length_remaining(tvb, foffset) < length)
length_remaining = tvb_length_remaining(tvb, foffset);
if(length_remaining == -1 || (guint32) length_remaining < length)
{
return;
}
@ -6093,6 +6096,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int
guint32 ndps_prog=0;
guint32 error_val=0;
guint32 resource_type=0;
gint length_remaining;
if (!pinfo->fd->flags.visited) {
/* Find the conversation whence the request would have come. */
@ -6243,7 +6247,8 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int
bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Option %d", i);
btree = proto_item_add_subtree(bitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
if(tvb_length_remaining(tvb, foffset) < length)
length_remaining = tvb_length_remaining(tvb, foffset);
if(length_remaining == -1 || (guint32) length_remaining < length)
{
return;
}
@ -7215,7 +7220,8 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int
bitem = proto_tree_add_text(atree, tvb, foffset, -1, "Item %d", i);
btree = proto_item_add_subtree(bitem, ett_ndps);
length=tvb_get_ntohl(tvb, foffset);
if(tvb_length_remaining(tvb, foffset) < length)
length_remaining = tvb_length_remaining(tvb, foffset);
if(length_remaining == -1 || (guint32) length_remaining < length)
{
return;
}

12
packet-wsp.c
View File

@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
* $Id: packet-wsp.c,v 1.71 2003/07/08 18:10:39 guy Exp $
* $Id: packet-wsp.c,v 1.72 2003/07/25 04:11:49 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -3149,7 +3149,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type)
if (value & 0x80)
{
ret = snprintf(valString+i,VAL_STRING_SIZE-i,"%s","(Confirmed push facility) ");
if (ret == -1 || ret >= VAL_STRING_SIZE-i) {
if (ret == -1 || (unsigned int) ret >= VAL_STRING_SIZE-i) {
/*
* We've been truncated
*/
@ -3164,7 +3164,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type)
goto add_string;
}
ret = snprintf(valString+i,VAL_STRING_SIZE-i,"%s","(Push facility) ");
if (ret == -1 || ret >= VAL_STRING_SIZE-i) {
if (ret == -1 || (unsigned int) ret >= VAL_STRING_SIZE-i) {
/*
* We've been truncated
*/
@ -3179,7 +3179,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type)
goto add_string;
}
ret = snprintf(valString+i,VAL_STRING_SIZE-i,"%s","(Session resume facility) ");
if (ret == -1 || ret >= VAL_STRING_SIZE-i) {
if (ret == -1 || (unsigned int) ret >= VAL_STRING_SIZE-i) {
/*
* We've been truncated
*/
@ -3194,7 +3194,7 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, int type)
goto add_string;
}
ret = snprintf(valString+i,VAL_STRING_SIZE-i,"%s","(Acknowledgement headers) ");
if (ret == -1 || ret >= VAL_STRING_SIZE-i) {
if (ret == -1 || (unsigned int) ret >= VAL_STRING_SIZE-i) {
/*
* We've been truncated
*/
@ -3270,7 +3270,7 @@ add_capability_vals(tvbuff_t *tvb, gboolean add_string, int offsetStr,
ret = snprintf(valString+i,valStringSize-i,"(0x%02x) ",
value);
}
if (ret == -1 || ret >= valStringSize-i) {
if (ret == -1 || (unsigned int) ret >= valStringSize-i) {
/*
* We've been truncated.
*/

10
tethereal.c
View File

@ -1,6 +1,6 @@
/* tethereal.c
*
* $Id: tethereal.c,v 1.189 2003/06/30 00:58:18 guy Exp $
* $Id: tethereal.c,v 1.190 2003/07/25 04:11:50 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1209,10 +1209,12 @@ main(int argc, char *argv[])
capture_opts.snaplen = MIN_PACKET_SIZE;
/* Check the value range of the ringbuffer_num_files parameter */
if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
#if RINGBUFFER_MIN_NUM_FILES > 0
else if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
#endif
#endif
if (rfilter != NULL) {