mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: tcp/unix: remove useless NULL check in {tcp,unix}_bind_listener()

Browse Source 
errmsg may only be NULL if errlen is zero. Clarify this in the comment too.

Reported-by: Dinko Korunic <dkorunic@reflected.net>
This commit is contained in:
Willy Tarreau 2013-01-24 01:41:38 +01:00
parent 4521ba689c
commit 8ab505bdef
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/proto_tcp.c
View File

@ -550,8 +550,9 @@ int tcp_connect_probe(struct connection *conn)
/* This function tries to bind a TCPv4/v6 listener. It may return a warning or /* This function tries to bind a TCPv4/v6 listener. It may return a warning or
* an error message in <err> if the message is at most <errlen> bytes long * an error message in <errmsg> if the message is at most <errlen> bytes long
* (including '\0'). The return value is composed from ERR_ABORT, ERR_WARN, * (including '\0'). Note that <errmsg> may be NULL if <errlen> is also zero.
* The return value is composed from ERR_ABORT, ERR_WARN,
* ERR_ALERT, ERR_RETRYABLE and ERR_FATAL. ERR_NONE indicates that everything * ERR_ALERT, ERR_RETRYABLE and ERR_FATAL. ERR_NONE indicates that everything
* was alright and that no message was returned. ERR_RETRYABLE means that an * was alright and that no message was returned. ERR_RETRYABLE means that an
* error occurred but that it may vanish after a retry (eg: port in use), and * error occurred but that it may vanish after a retry (eg: port in use), and
@ -568,7 +569,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
const char *msg = NULL; const char *msg = NULL;
/* ensure we never return garbage */ /* ensure we never return garbage */
if (errmsg && errlen) if (errlen)
*errmsg = 0; *errmsg = 0;
if (listener->state != LI_ASSIGNED) if (listener->state != LI_ASSIGNED)

7
src/proto_uxst.c
View File

@ -144,7 +144,10 @@ static void destroy_uxst_socket(const char *path)
/* This function creates a UNIX socket associated to the listener. It changes /* This function creates a UNIX socket associated to the listener. It changes
* the state from ASSIGNED to LISTEN. The socket is NOT enabled for polling. * the state from ASSIGNED to LISTEN. The socket is NOT enabled for polling.
* The return value is composed from ERR_NONE, ERR_RETRYABLE and ERR_FATAL. * The return value is composed from ERR_NONE, ERR_RETRYABLE and ERR_FATAL. It
* may return a warning or an error message in <errmsg> if the message is at
* most <errlen> bytes long (including '\0'). Note that <errmsg> may be NULL if
* <errlen> is also zero.
*/ */
static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen) static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen)
{ {
@ -158,7 +161,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
int ret; int ret;
/* ensure we never return garbage */ /* ensure we never return garbage */
if (errmsg && errlen) if (errlen)
*errmsg = 0; *errmsg = 0;
if (listener->state != LI_ASSIGNED) if (listener->state != LI_ASSIGNED)