aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--capture.c5
-rw-r--r--packet-afs.c4
-rw-r--r--packet-clnp.c4
-rw-r--r--packet-dns.c4
-rw-r--r--packet-giop.c6
-rw-r--r--prefs.c6
-rw-r--r--print.c6
8 files changed, 19 insertions, 17 deletions
diff --git a/AUTHORS b/AUTHORS
index 3483d5e5d0..a9dc428750 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -78,6 +78,7 @@ Joerg Mayer <jmayer@loplof.de> {
Support for "-N" flag enabling selected forms of name resolution
Changes to structure initializations to initialize all members
Define __USE_XOPEN in files that use "strptime()"
+ Various signed vs. unsigned fixes
}
Martin Maciaszek <fastjack@i-s-o.net> {
diff --git a/capture.c b/capture.c
index 85b8aada0e..80e72eca39 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
/* capture.c
* Routines for packet capture windows
*
- * $Id: capture.c,v 1.152 2001/06/15 01:36:46 guy Exp $
+ * $Id: capture.c,v 1.153 2001/06/18 01:49:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1208,7 +1208,8 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
bpf_u_int32 netnum, netmask;
struct bpf_program fcode;
time_t upd_time, cur_time;
- int err, inpkts, i;
+ int err, inpkts;
+ unsigned int i;
static const char capstart_msg = SP_CAPSTART;
char errmsg[4096+1];
#ifndef _WIN32
diff --git a/packet-afs.c b/packet-afs.c
index dda21efef7..0394989a9f 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs.c,v 1.31 2001/05/27 05:00:17 guy Exp $
+ * $Id: packet-afs.c,v 1.32 2001/06/18 01:49:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -427,7 +427,7 @@ static int
dissect_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
{
int old_offset;
- guint32 bytes;
+ gint32 bytes;
int i, n, pos, neg, acl;
char user[128]; /* Be sure to adjust sscanf()s below if length is changed... */
diff --git a/packet-clnp.c b/packet-clnp.c
index 898c8be19c..40ce8fbdf3 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
/* packet-clnp.c
* Routines for ISO/OSI network and transport protocol packet disassembly
*
- * $Id: packet-clnp.c,v 1.31 2001/06/08 07:44:36 guy Exp $
+ * $Id: packet-clnp.c,v 1.32 2001/06/18 01:49:16 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -1583,7 +1583,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
int offset;
u_char src_len, dst_len, nsel, opt_len = 0;
const guint8 *dst_addr, *src_addr;
- guint len;
+ gint len;
guint next_length;
proto_tree *discpdu_tree;
address save_dl_src;
diff --git a/packet-dns.c b/packet-dns.c
index 0b3360cbcc..39f2fbe58b 100644
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
/* packet-dns.c
* Routines for DNS packet disassembly
*
- * $Id: packet-dns.c,v 1.66 2001/04/23 18:05:18 guy Exp $
+ * $Id: packet-dns.c,v 1.67 2001/06/18 01:49:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -435,7 +435,7 @@ get_dns_name(const u_char *pd, int offset, int dns_data_offset,
int len = -1;
int chars_processed = 0;
int data_size = pi.len - dns_data_offset;
- u_int component_len;
+ int component_len;
maxname--; /* reserve space for the trailing '\0' */
for (;;) {
diff --git a/packet-giop.c b/packet-giop.c
index 035aae33ef..8cb4a320a0 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -4,7 +4,7 @@
* Laurent Deniel <deniel@worldnet.fr>
* Craig Rodrigues <rodrigc@mediaone.net>
*
- * $Id: packet-giop.c,v 1.32 2001/04/27 01:27:36 guy Exp $
+ * $Id: packet-giop.c,v 1.33 2001/06/18 01:49:16 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -99,7 +99,7 @@ static const value_string giop_locate_status_types[] = {
static const guint GIOP_MAJOR = 1;
static const guint GIOP_MINOR = 2;
-static const guint GIOP_HEADER_SIZE = 12;
+static const gint GIOP_HEADER_SIZE = 12;
static const int KeyAddr = 0;
static const int ProfileAddr = 1;
@@ -198,7 +198,7 @@ typedef enum ReplyStatusType
}
ReplyStatusType;
-const static value_string reply_status_types[] = {
+static const value_string reply_status_types[] = {
{ NO_EXCEPTION, "No Exception" } ,
{ USER_EXCEPTION, "User Exception" } ,
{ SYSTEM_EXCEPTION, "System Exception" } ,
diff --git a/prefs.c b/prefs.c
index d9944596dd..d01ebc0429 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.52 2001/06/04 08:07:34 guy Exp $
+ * $Id: prefs.c,v 1.53 2001/06/18 01:49:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -889,7 +889,7 @@ name_resolve_to_string(guint32 name_resolve)
{
static char string[N_NAME_RESOLVE_OPT+1];
char *p;
- int i;
+ unsigned int i;
gboolean all_opts_set = TRUE;
if (name_resolve == PREFS_RESOLV_NONE)
@@ -911,7 +911,7 @@ char
string_to_name_resolve(char *string, guint32 *name_resolve)
{
char c;
- int i;
+ unsigned int i;
*name_resolve = 0;
while ((c = *string++) != '\0') {
diff --git a/print.c b/print.c
index f3e8470e48..4e3432087e 100644
--- a/print.c
+++ b/print.c
@@ -1,7 +1,7 @@
/* print.c
* Routines for printing packet analysis trees.
*
- * $Id: print.c,v 1.35 2001/06/08 10:07:55 guy Exp $
+ * $Id: print.c,v 1.36 2001/06/18 01:49:17 guy Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@@ -249,7 +249,7 @@ static
void print_hex_data_text(FILE *fh, register const u_char *cp,
register u_int length, char_enc encoding)
{
- register int ad, i, j, k;
+ register unsigned int ad, i, j, k;
u_char c;
u_char line[80];
static u_char binhex[16] = {
@@ -362,7 +362,7 @@ static
void print_hex_data_ps(FILE *fh, register const u_char *cp,
register u_int length, char_enc encoding)
{
- register int ad, i, j, k;
+ register unsigned int ad, i, j, k;
u_char c;
u_char line[60];
static u_char binhex[16] = {