matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipxfrm: Replace STRBUF_CAT macro with strlcat() 

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-09-01 18:52:54 +02:00 committed by Stephen Hemminger
parent 532b8874fe
commit 44cc6c792a
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ip/ipxfrm.c
View File

@ -40,17 +40,6 @@
#include "ip_common.h" #include "ip_common.h"
#define STRBUF_SIZE (128) #define STRBUF_SIZE (128)
#define STRBUF_CAT(buf, str) \
do { \
int rest = sizeof(buf) - 1 - strlen(buf); \
if (rest > 0) { \
int len = strlen(str); \
if (len > rest) \
len = rest; \
strncat(buf, str, len); \
buf[sizeof(buf) - 1] = '\0'; \
} \
} while (0);
struct xfrm_filter filter; struct xfrm_filter filter;
@ -902,8 +891,8 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
prefix, title); prefix, title);
if (prefix) if (prefix)
STRBUF_CAT(buf, prefix); strlcat(buf, prefix, sizeof(buf));
STRBUF_CAT(buf, "\t"); strlcat(buf, "\t", sizeof(buf));
fputs(buf, fp); fputs(buf, fp);
fprintf(fp, "replay-window %u ", xsinfo->replay_window); fprintf(fp, "replay-window %u ", xsinfo->replay_window);
@ -944,7 +933,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
char sbuf[STRBUF_SIZE]; char sbuf[STRBUF_SIZE];
memcpy(sbuf, buf, sizeof(sbuf)); memcpy(sbuf, buf, sizeof(sbuf));
STRBUF_CAT(sbuf, "sel "); strlcat(sbuf, "sel ", sizeof(sbuf));
xfrm_selector_print(&xsinfo->sel, xsinfo->family, fp, sbuf); xfrm_selector_print(&xsinfo->sel, xsinfo->family, fp, sbuf);
} }
@ -992,8 +981,8 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo,
} }
if (prefix) if (prefix)
STRBUF_CAT(buf, prefix); strlcat(buf, prefix, sizeof(buf));
STRBUF_CAT(buf, "\t"); strlcat(buf, "\t", sizeof(buf));
fputs(buf, fp); fputs(buf, fp);
if (xpinfo->dir >= XFRM_POLICY_MAX) { if (xpinfo->dir >= XFRM_POLICY_MAX) {