diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-23 09:40:38 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-23 09:40:38 +0000 |
| commit | f23161ffdef48d155932d94f415e0ddd2d787ee9 (patch) | |
| tree | dfb5930291f2d98e6c77344ceaf5619f966094f5 | |
| parent | 7599ed2631028475da016ac36c1a43c28a0defaa (diff) | |
Change return type of tvb_format_text from guint8* to gchar*.
Remove now unnecessary casts in two files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9801 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/tvbuff.c | 4 | ||||
| -rw-r--r-- | epan/tvbuff.h | 4 | ||||
| -rw-r--r-- | packet-rsvp.c | 4 | ||||
| -rw-r--r-- | packet-wsp.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index b864a61c96..12d2600ee2 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.c,v 1.56 2003/12/24 23:28:17 guy Exp $ + * $Id: tvbuff.c,v 1.57 2004/01/23 09:40:38 jmayer Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * @@ -1629,7 +1629,7 @@ tvb_fake_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian) * Format the data in the tvb from offset for length ... */ -guint8 * +gchar * tvb_format_text(tvbuff_t *tvb, gint offset, gint size) { guint8 *ptr; diff --git a/epan/tvbuff.h b/epan/tvbuff.h index aa5339510a..d2319ba64f 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.h,v 1.36 2003/12/03 09:50:40 sahlberg Exp $ + * $Id: tvbuff.h,v 1.37 2004/01/23 09:40:38 jmayer Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu> * @@ -380,7 +380,7 @@ extern char *tvb_fake_unicode(tvbuff_t *tvb, int offset, int len, /* * Format the data in the tvb from offset for size ... */ -extern guint8 * tvb_format_text(tvbuff_t *tvb, gint offset, gint size); +extern gchar * tvb_format_text(tvbuff_t *tvb, gint offset, gint size); /* * Given a tvbuff, an offset, and a length, allocate a buffer big enough diff --git a/packet-rsvp.c b/packet-rsvp.c index 53ad6e9302..d395b0d86b 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-rsvp.c,v 1.86 2003/11/11 20:11:05 guy Exp $ + * $Id: packet-rsvp.c,v 1.87 2004/01/23 09:40:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2899,7 +2899,7 @@ dissect_rsvp_session_attribute (proto_tree *ti, tvbuff_t *tvb, flags &0x04 ? "SE Style, " : "", flags &0x08 ? "Bandwidth Protection, " : "", flags &0x10 ? "Node Protection, " : "", - name_len ? (char*)tvb_format_text(tvb, offset2+4, name_len) : ""); + name_len ? tvb_format_text(tvb, offset2+4, name_len) : ""); break; default: diff --git a/packet-wsp.c b/packet-wsp.c index 6d0c1ecb9a..7a7ae7805a 100644 --- a/packet-wsp.c +++ b/packet-wsp.c @@ -2,7 +2,7 @@ * * Routines to dissect WSP component of WAP traffic. * - * $Id: packet-wsp.c,v 1.105 2004/01/10 15:33:51 obiot Exp $ + * $Id: packet-wsp.c,v 1.106 2004/01/23 09:40:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -5227,7 +5227,7 @@ add_uri (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, ti = proto_tree_add_item (tree, hf_wsp_header_uri, tvb, URIOffset, uriLen, bo_little_endian); - str = (gchar *)tvb_format_text (tvb, URIOffset, uriLen); + str = tvb_format_text (tvb, URIOffset, uriLen); /* XXX - tvb_format_text() returns a pointer to a static text string * so please DO NOT attempt at g_free()ing it! */ |