diff options
| author | Eric Leblond <eric@inl.fr> | 2008-07-31 10:43:08 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-07-31 10:43:08 +0200 |
| commit | 1524d689f179eaaae0836ad8ef2da31b10664feb (patch) | |
| tree | 875bf42c1a5abefc8a7ba06e0fc0de21ad0a1049 /util | |
| parent | 14a8a1e7dd1301002c99598a2b067cde3ca19b6e (diff) | |
cleanup: fix compilation warnings related to pointer comparisons
This patch cast to (char *) some (void *) to avoid a gcc warning in
string format parsing.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org
Diffstat (limited to 'util')
| -rw-r--r-- | util/db.c | 2 | ||||
| -rw-r--r-- | util/printflow.c | 8 | ||||
| -rw-r--r-- | util/printpkt.c | 12 |
3 files changed, 11 insertions, 11 deletions
@@ -284,7 +284,7 @@ static int __interp_db(struct ulogd_pluginstance *upi) sprintf(di->stmt_ins, "',"); break; case ULOGD_RET_RAWSTR: - sprintf(di->stmt_ins, "%s,", res->u.value.ptr); + sprintf(di->stmt_ins, "%s,", (char *) res->u.value.ptr); break; case ULOGD_RET_RAW: ulogd_log(ULOGD_NOTICE, diff --git a/util/printflow.c b/util/printflow.c index 73d2969..bb3c2c4 100644 --- a/util/printflow.c +++ b/util/printflow.c @@ -164,12 +164,12 @@ int printflow_print(struct ulogd_key *res, char *buf) if (pp_is_valid(res, PRINTFLOW_ORIG_IP_SADDR)) buf_cur += sprintf(buf_cur, "SRC=%s ", - GET_VALUE(res, PRINTFLOW_ORIG_IP_SADDR).ptr); + (char *) GET_VALUE(res, PRINTFLOW_ORIG_IP_SADDR).ptr); if (pp_is_valid(res, PRINTFLOW_ORIG_IP_DADDR)) buf_cur += sprintf(buf_cur, "DST=%s ", - GET_VALUE(res, PRINTFLOW_ORIG_IP_DADDR).ptr); + (char *) GET_VALUE(res, PRINTFLOW_ORIG_IP_DADDR).ptr); if (!pp_is_valid(res, PRINTFLOW_ORIG_IP_PROTOCOL)) goto orig_out; @@ -215,12 +215,12 @@ orig_out: if (pp_is_valid(res, PRINTFLOW_REPLY_IP_SADDR)) buf_cur += sprintf(buf_cur, "SRC=%s ", - GET_VALUE(res,PRINTFLOW_REPLY_IP_SADDR).ptr); + (char *) GET_VALUE(res,PRINTFLOW_REPLY_IP_SADDR).ptr); if (pp_is_valid(res, PRINTFLOW_REPLY_IP_DADDR)) buf_cur += sprintf(buf_cur, "DST=%s ", - GET_VALUE(res,PRINTFLOW_REPLY_IP_DADDR).ptr); + (char *) GET_VALUE(res,PRINTFLOW_REPLY_IP_DADDR).ptr); if (!pp_is_valid(res, PRINTFLOW_REPLY_IP_PROTOCOL)) goto reply_out; diff --git a/util/printpkt.c b/util/printpkt.c index c64a4cb..5359b8b 100644 --- a/util/printpkt.c +++ b/util/printpkt.c @@ -193,11 +193,11 @@ static int printpkt_ipv4(struct ulogd_key *res, char *buf) if (pp_is_valid(res, KEY_IP_SADDR)) buf_cur += sprintf(buf_cur, "SRC=%s ", - GET_VALUE(res, KEY_IP_SADDR).ptr); + (char *) GET_VALUE(res, KEY_IP_SADDR).ptr); if (pp_is_valid(res, KEY_IP_DADDR)) buf_cur += sprintf(buf_cur, "DST=%s ", - GET_VALUE(res, KEY_IP_DADDR).ptr); + (char *) GET_VALUE(res, KEY_IP_DADDR).ptr); /* FIXME: add pp_is_valid calls to remainder of file */ buf_cur += sprintf(buf_cur,"LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", @@ -279,11 +279,11 @@ static int printpkt_ipv6(struct ulogd_key *res, char *buf) if (pp_is_valid(res, KEY_IP_SADDR)) buf_cur += sprintf(buf_cur, "SRC=%s ", - GET_VALUE(res, KEY_IP_SADDR).ptr); + (char *) GET_VALUE(res, KEY_IP_SADDR).ptr); if (pp_is_valid(res, KEY_IP_DADDR)) buf_cur += sprintf(buf_cur, "DST=%s ", - GET_VALUE(res, KEY_IP_DADDR).ptr); + (char *) GET_VALUE(res, KEY_IP_DADDR).ptr); if (pp_is_valid(res, KEY_IP6_PAYLOAD_LEN)) buf_cur += sprintf(buf_cur, "LEN=%Zu ", @@ -355,11 +355,11 @@ int printpkt_arp(struct ulogd_key *res, char *buf) if (pp_is_valid(res, KEY_ARP_SPA)) buf_cur += sprintf(buf_cur, "SRC=%s ", - GET_VALUE(res, KEY_ARP_SPA).ptr); + (char *) GET_VALUE(res, KEY_ARP_SPA).ptr); if (pp_is_valid(res, KEY_ARP_TPA)) buf_cur += sprintf(buf_cur, "DST=%s ", - GET_VALUE(res, KEY_ARP_TPA).ptr); + (char *) GET_VALUE(res, KEY_ARP_TPA).ptr); buf_cur += sprintf(buf_cur, "PROTO=ARP "); |