aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcm.c
diff options
context:
space:
mode:
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-27 22:50:11 +0000
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-27 22:50:11 +0000
commit262e9603cc96f769b6b56ece2aade338cdc8ba6a (patch)
treed6caa166a922ab9201a06c6827d5408546e38be8 /epan/dissectors/packet-dcm.c
parent406b553ac0aa13c9e1f06f4803b373296ec4cde0 (diff)
Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21233 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
-rw-r--r--epan/dissectors/packet-dcm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 930073e232..86d1fd6a12 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -529,7 +529,7 @@ dcm_tag2str(guint16 grp, guint16 elm, guint8 syntax, tvbuff_t *tvb, int offset,
p+=MIN(MAX_BUF_LEN-(p-buf),
g_snprintf(p, MAX_BUF_LEN-(p-buf), "%s", dtag->desc));
if (vr > 0) {
- vval = tvb_format_text(tvb, vr, 2);
+ vval = (guint8*)tvb_format_text(tvb, vr, 2);
p+=MIN(MAX_BUF_LEN-(p-buf),
g_snprintf(p, MAX_BUF_LEN-(p-buf), " [%s]", vval));
}
@@ -537,7 +537,7 @@ dcm_tag2str(guint16 grp, guint16 elm, guint8 syntax, tvbuff_t *tvb, int offset,
switch (tr > 0 ? tr : dtag->dtype) {
case DCM_TSTR:
default: /* try ascii */
- vval = tvb_format_text(tvb, offset, len);
+ vval = (guint8*)tvb_format_text(tvb, offset, len);
p+=MIN(MAX_BUF_LEN-(p-buf),
g_snprintf(p, MAX_BUF_LEN-(p-buf), " %s", vval));
break;
@@ -639,7 +639,7 @@ dissect_dcm_assoc(dcmState_t *dcm_data, proto_item *ti, tvbuff_t *tvb, int offse
proto_tree_add_item(dcm_tree, hf_dcm_pdi_syntax, tvb, offset, len > 65 ? 65 : len, FALSE);
if (reply && di && di->valid) {
name = tvb_get_ephemeral_string(tvb, offset, len);
- dcm_setSyntax(di, name);
+ dcm_setSyntax(di, (char*)name);
}
reply = 0;
offset += len;