diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
| commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
| tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /epan/sna-utils.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
| download | wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.tar.gz wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.tar.bz2 wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.zip | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'epan/sna-utils.c')
| -rw-r--r-- | epan/sna-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/sna-utils.c b/epan/sna-utils.c index c962285998..27ed1a70a8 100644 --- a/epan/sna-utils.c +++ b/epan/sna-utils.c @@ -37,7 +37,7 @@ sna_fid_to_str(const address *addr) { gchar *cur; - cur=ep_alloc(14); + cur=(gchar *)ep_alloc(14); sna_fid_to_str_buf(addr, cur, 14); return cur; } @@ -51,12 +51,12 @@ sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len) switch (addr->len) { case 1: - addrdata = addr->data; + addrdata = (guint8 *)addr->data; g_snprintf(buf, buf_len, "%04X", addrdata[0]); break; case 2: - addrdata = addr->data; + addrdata = (guint8 *)addr->data; g_snprintf(buf, buf_len, "%04X", pntohs(&addrdata[0])); break; |