mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: checks: remove the last strcat and eliminate a warning on OpenBSD

Browse Source 
OpenBSD emits warnings on usages of strcpy, strcat and sprintf (and
probably a few others). Here we have a single such warning in all the code
reintroduced by commit 0ba0e4a ("MEDIUM: Support sending email alerts") in
1.6-dev1. Let's get rid of it, the open-coding of strcat is as small as its
usage and the the result is even more efficient.

This fix needs to be backported to 1.6.
This commit is contained in:
Willy Tarreau 2016-08-10 19:29:09 +02:00
parent d2629f293e
commit 64345aaaf0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/checks.c
View File

@ -3177,6 +3177,8 @@ static int add_tcpcheck_expect_str(struct list *list, const char *str)
static int add_tcpcheck_send_strs(struct list *list, const char * const *strs)
{
struct tcpcheck_rule *tcpcheck;
const char *in;
char *dst;
int i;
tcpcheck = calloc(1, sizeof *tcpcheck);
@ -3194,10 +3196,11 @@ static int add_tcpcheck_send_strs(struct list *list, const char * const *strs)
free(tcpcheck);
return 0;
}
tcpcheck->string[0] = '\0';
dst = tcpcheck->string;
for (i = 0; strs[i]; i++)
strcat(tcpcheck->string, strs[i]);
for (in = strs[i]; (*dst = *in++); dst++);
*dst = 0;
LIST_ADDQ(list, &tcpcheck->list);
return 1;