mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: backend: fix 3 build warnings related to null-deref at -Wextra

Browse Source 
These ones are not valid either since the checks are performed a few
lines above the call. Let's switch to __objt_server() instead.
This commit is contained in:
Willy Tarreau 2018-09-20 11:29:28 +02:00
parent 55e0da664e
commit 1e582e5e5c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend.c
View File

@ -795,8 +795,8 @@ int assign_server_address(struct stream *s)
if (!(s->flags & SF_ASSIGNED)) if (!(s->flags & SF_ASSIGNED))
return SRV_STATUS_INTERNAL; return SRV_STATUS_INTERNAL;
srv_conn->addr.to = objt_server(s->target)->addr; srv_conn->addr.to = __objt_server(s->target)->addr;
set_host_port(&srv_conn->addr.to, objt_server(s->target)->svc_port); set_host_port(&srv_conn->addr.to, __objt_server(s->target)->svc_port);
if (!is_addr(&srv_conn->addr.to) && cli_conn) { if (!is_addr(&srv_conn->addr.to) && cli_conn) {
/* if the server has no address, we use the same address /* if the server has no address, we use the same address
@ -815,7 +815,7 @@ int assign_server_address(struct stream *s)
/* if this server remaps proxied ports, we'll use /* if this server remaps proxied ports, we'll use
* the port the client connected to with an offset. */ * the port the client connected to with an offset. */
if ((objt_server(s->target)->flags & SRV_F_MAPPORTS) && cli_conn) { if ((__objt_server(s->target)->flags & SRV_F_MAPPORTS) && cli_conn) {
int base_port; int base_port;
conn_get_to_addr(cli_conn); conn_get_to_addr(cli_conn);
@ -1761,7 +1761,7 @@ smp_fetch_srv_id(const struct arg *args, struct sample *smp, const char *kw, voi
return 0; return 0;
smp->data.type = SMP_T_SINT; smp->data.type = SMP_T_SINT;
smp->data.u.sint = objt_server(smp->strm->target)->puid; smp->data.u.sint = __objt_server(smp->strm->target)->puid;
return 1; return 1;
} }