aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-01-19 18:36:32 +0000
committerJörg Mayer <jmayer@loplof.de>2004-01-19 18:36:32 +0000
commit6f6fc13e5b57f0baa1847b2e3d3f9a9f9dad4c44 (patch)
tree5d3ad90b873ccf11c5b1ce0132cbcb248d0c1715
parent193ed36457a43dffaa19a07752799a8aec0a6c93 (diff)
downloadwireshark-6f6fc13e5b57f0baa1847b2e3d3f9a9f9dad4c44.tar.gz
wireshark-6f6fc13e5b57f0baa1847b2e3d3f9a9f9dad4c44.tar.bz2
wireshark-6f6fc13e5b57f0baa1847b2e3d3f9a9f9dad4c44.zip
Trivial signed/unsigned warning fixes
svn path=/trunk/; revision=9734
-rw-r--r--packet-afs-macros.h6
-rw-r--r--packet-afs.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/packet-afs-macros.h b/packet-afs-macros.h
index b7ed67320d..2c06a39ce1 100644
--- a/packet-afs-macros.h
+++ b/packet-afs-macros.h
@@ -8,7 +8,7 @@
* Portions based on information/specs retrieved from the OpenAFS sources at
* www.openafs.org, Copyright IBM.
*
- * $Id: packet-afs-macros.h,v 1.22 2003/01/18 02:18:39 guy Exp $
+ * $Id: packet-afs-macros.h,v 1.23 2004/01/19 18:36:32 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -112,9 +112,9 @@
/* Output a rx style string, up to a maximum length first
4 bytes - length, then char data */
#define OUT_RXString(field) \
- { int i,len; \
+ { guint32 i,len; \
char *tmp; \
- const char *p; \
+ const guint8 *p; \
i = tvb_get_ntohl(tvb, offset); \
offset += 4; \
p = tvb_get_ptr(tvb,offset,i); \
diff --git a/packet-afs.c b/packet-afs.c
index 9972edbc83..6a4ea04040 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.55 2003/12/27 03:45:45 guy Exp $
+ * $Id: packet-afs.c,v 1.56 2004/01/19 18:36:32 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,7 +48,7 @@
#include "packet-afs-defs.h"
#include "packet-afs-macros.h"
-#define GETSTR tvb_get_ptr(tvb,offset,tvb_ensure_length_remaining(tvb,offset))
+#define GETSTR ((const char *)tvb_get_ptr(tvb,offset,tvb_ensure_length_remaining(tvb,offset)))
#define VALID_OPCODE(opcode) ((opcode >= OPCODE_LOW && opcode <= OPCODE_HIGH) || \
(opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || \