osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixed a guint64 compile issue with a Sun C 5.8 compiler. 

Fixed a tree placement.

svn path=/trunk/; revision=24086
This commit is contained in:
Stig Bjørlykke 2008-01-14 09:51:22 +00:00
parent 8b4e80384a
commit b0c8583de7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-dmp.c
View File

@ -1064,7 +1064,7 @@ static gboolean dmp_dec_xbyte_sic (guint64 bin, gchar *sic,
gboolean failure = FALSE;
gdouble multiplier;
guint8 i;
gint64 p;
guint64 p, tmp;
if (no_char >= MAX_SIC_LEN) {
/* Illegal length */
@ -1079,9 +1079,10 @@ static gboolean dmp_dec_xbyte_sic (guint64 bin, gchar *sic,
}
for (i = 0; i < no_char; i++) {
p = (gint64) pow (multiplier, no_char - 1 - i);
sic[i] = (gchar) (bin / p);
bin -= sic[i] * p;
p = (guint64) pow (multiplier, no_char - 1 - i);
tmp = bin / p;
bin -= tmp * p;
sic[i] = (gchar) tmp;
if (sic[i] <= 9) {
sic[i] += '0';
} else if (sic[i] <= 35) {
@ -1735,7 +1736,7 @@ static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo,
offset += 1;
}
en = proto_tree_add_uint_format (addr_tree, hf_addr_dir_address_generated,
en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address_generated,
tvb, offset, 0, dir_addr,
"%sDirect Address: %d",
val_to_str (addr_type, addr_type_str, ""),