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/column-utils.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
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/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 96b94f8a7c..0f80e4e58a 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1458,7 +1458,7 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool pinfo->cinfo->col_expr.col_expr[col] = "ax25.src"; else pinfo->cinfo->col_expr.col_expr[col] = "ax25.dst"; - g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], ax25_to_str(addr->data), COL_MAX_LEN); + g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], ax25_to_str((guint8 *)addr->data), COL_MAX_LEN); break; case AT_ETHER: @@ -1474,7 +1474,7 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool pinfo->cinfo->col_expr.col_expr[col] = "ip.src"; else pinfo->cinfo->col_expr.col_expr[col] = "ip.dst"; - ip_to_str_buf(addr->data, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); + ip_to_str_buf((guint8 *)addr->data, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); break; case AT_IPv6: |