diff options
Diffstat (limited to 'epan/address_types.c')
| -rw-r--r-- | epan/address_types.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/address_types.c b/epan/address_types.c index f73ed932da..f416bd168d 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -418,7 +418,7 @@ static int eui64_addr_to_str(const address* addr, gchar *buf, int buf_len _U_) { buf = bytes_to_hexstr_punct(buf, (const guint8 *)addr->data, 8, ':'); *buf = '\0'; /* NULL terminate */ - return sizeof(buf) + 1; + return (int)(strlen(buf)+1); } static int eui64_str_len(const address* addr _U_) @@ -442,12 +442,9 @@ ib_addr_to_str(const address *addr, gchar *buf, int buf_len) } /* this is a LID (16 bits) */ - guint16 lid_number; - - memcpy((void *)&lid_number, addr->data, sizeof lid_number); - g_snprintf(buf,buf_len,"LID: %u",lid_number); + g_snprintf(buf,buf_len,"LID: %u", *(guint16 *)addr->data); - return sizeof(buf) + 1; // XXX this looks all kinds of wrong + return (int)(strlen(buf)+1); } static int ib_str_len(const address* addr _U_) |