diff options
-rw-r--r-- | epan/ftypes/ftype-string.c | 4 | ||||
-rw-r--r-- | epan/ftypes/ftypes.h | 3 | ||||
-rw-r--r-- | epan/ipv4.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 814bb481a7..6cbc9786df 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -1,5 +1,5 @@ /* - * $Id: ftype-string.c,v 1.18 2003/12/18 13:02:19 obiot Exp $ + * $Id: ftype-string.c,v 1.19 2004/02/01 02:35:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -172,7 +172,7 @@ slice(fvalue_t *fv, GByteArray *bytes, guint offset, guint length) { guint8* data; - data = fv->value.string + offset; + data = fv->value.ustring + offset; g_byte_array_append(bytes, data, length); } diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 75300280b2..e30f1cb508 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -1,7 +1,7 @@ /* ftypes.h * Definitions for field types * - * $Id: ftypes.h,v 1.29 2004/01/25 17:22:57 jmayer Exp $ + * $Id: ftypes.h,v 1.30 2004/02/01 02:35:30 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -141,6 +141,7 @@ typedef struct _fvalue_t { guint32 integer; gdouble floating; gchar *string; + guchar *ustring; GByteArray *bytes; GString *gstring; ipv4_addr ipv4; diff --git a/epan/ipv4.c b/epan/ipv4.c index 22e60d0053..45de381d20 100644 --- a/epan/ipv4.c +++ b/epan/ipv4.c @@ -5,7 +5,7 @@ * * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: ipv4.c,v 1.6 2003/08/19 18:30:44 guy Exp $ + * $Id: ipv4.c,v 1.7 2004/02/01 02:35:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,7 +89,7 @@ void ipv4_addr_str_buf(const ipv4_addr *ipv4, gchar *buf) { guint32 ipv4_host_order = g_htonl(ipv4->addr); - ip_to_str_buf((gchar*)&ipv4_host_order, buf); + ip_to_str_buf((guint8*)&ipv4_host_order, buf); } static guint32 |