aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-srvloc.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2008-07-11 20:12:22 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2008-07-11 20:12:22 +0000
commit8b4468cacd9b06eaee095325a526060886b5363b (patch)
tree27af6805c605ee04396fe0691ab359298d75d9eb /epan/dissectors/packet-srvloc.c
parent2a89ea15d5c8565d266b3592159c61719c013670 (diff)
Fix a couple signed/unsigned char mismatches (still more here)
svn path=/trunk/; revision=25713
Diffstat (limited to 'epan/dissectors/packet-srvloc.c')
-rw-r--r--epan/dissectors/packet-srvloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 03c40c3ae9..394490424e 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -451,7 +451,7 @@ add_v1_string(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
static guint8*
unicode_to_bytes(tvbuff_t *tvb, int offset, int length, gboolean endianness)
{
- const char *ascii_text = tvb_get_ptr(tvb, offset, length);
+ const guint8 *ascii_text = tvb_get_ptr(tvb, offset, length);
int i, j=0;
guint8 c_char, c_char1;
guint8 *byte_array;
@@ -516,7 +516,7 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
guint8 *byte_value;
proto_item *ti;
proto_tree *srvloc_tree;
- guint8 *tmp;
+ char *tmp;
static const value_string srvloc_svc[] = {
{ 50, "TCP/UDP" },
@@ -566,10 +566,10 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
if (strcmp(attr_type, "svcaddr-ws")==0) {
i=1;
for (foffset = offset; foffset<length; foffset += 2) {
-
+
ti = proto_tree_add_text(tree, tvb, foffset, -1, "Item %d", i);
srvloc_tree = proto_item_add_subtree(ti, ett_srvloc_attr);
-
+
svc = tvb_get_guint8(tvb, foffset+1);
proto_tree_add_text(srvloc_tree, tvb, foffset+1, 1,
"Service Type: %s", val_to_str(svc, srvloc_svc, "Unknown"));