mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: Apply ist.cocci

Browse Source 
This is to make use of `chunk_istcat()`.
This commit is contained in:
Tim Duesterhus 2021-11-08 09:05:04 +01:00 committed by Willy Tarreau
parent b9656e4837
commit 9f7ed8a60c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cache.c
View File

@ -1644,7 +1644,7 @@ int sha1_hosturi(struct stream *s)
chunk_istcat(trash, ctx.value); chunk_istcat(trash, ctx.value);
} }
chunk_memcat(trash, uri.ptr, uri.len); chunk_istcat(trash, uri);
/* hash everything */ /* hash everything */
blk_SHA1_Init(&sha1_ctx); blk_SHA1_Init(&sha1_ctx);

2
src/http_fetch.c
View File

@ -874,7 +874,7 @@ static int smp_fetch_hdr_names(const struct arg *args, struct sample *smp, const
if (temp->data) if (temp->data)
temp->area[temp->data++] = del; temp->area[temp->data++] = del;
chunk_memcat(temp, n.ptr, n.len); chunk_istcat(temp, n);
} }
smp->data.type = SMP_T_STR; smp->data.type = SMP_T_STR;

4
src/http_htx.c
View File

@ -432,7 +432,7 @@ int http_replace_req_path(struct htx *htx, const struct ist path, int with_qs)
vsn = ist2(temp->area + meth.len, HTX_SL_REQ_VLEN(sl)); vsn = ist2(temp->area + meth.len, HTX_SL_REQ_VLEN(sl));
chunk_memcat(temp, uri.ptr, p.ptr - uri.ptr); /* uri: host part */ chunk_memcat(temp, uri.ptr, p.ptr - uri.ptr); /* uri: host part */
chunk_memcat(temp, path.ptr, path.len); /* uri: new path */ chunk_istcat(temp, path); /* uri: new path */
chunk_memcat(temp, p.ptr + plen, p.len - plen); /* uri: QS part */ chunk_memcat(temp, p.ptr + plen, p.len - plen); /* uri: QS part */
uri = ist2(temp->area + meth.len + vsn.len, uri.len - plen + path.len); uri = ist2(temp->area + meth.len + vsn.len, uri.len - plen + path.len);
@ -711,7 +711,7 @@ int http_update_authority(struct htx *htx, struct htx_sl *sl, const struct ist h
vsn = ist2(temp->area + meth.len, HTX_SL_REQ_VLEN(sl)); vsn = ist2(temp->area + meth.len, HTX_SL_REQ_VLEN(sl));
chunk_memcat(temp, uri.ptr, authority.ptr - uri.ptr); chunk_memcat(temp, uri.ptr, authority.ptr - uri.ptr);
chunk_memcat(temp, host.ptr, host.len); chunk_istcat(temp, host);
chunk_memcat(temp, istend(authority), istend(uri) - istend(authority)); chunk_memcat(temp, istend(authority), istend(uri) - istend(authority));
uri = ist2(temp->area + meth.len + vsn.len, host.len + uri.len - authority.len); /* uri */ uri = ist2(temp->area + meth.len + vsn.len, host.len + uri.len - authority.len); /* uri */

10
src/mux_fcgi.c
View File

@ -1242,17 +1242,17 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
if (!(params->mask & FCGI_SP_REQ_METH)) { if (!(params->mask & FCGI_SP_REQ_METH)) {
p = htx_sl_req_meth(sl); p = htx_sl_req_meth(sl);
params->meth = ist2(b_tail(params->p), p.len); params->meth = ist2(b_tail(params->p), p.len);
chunk_memcat(params->p, p.ptr, p.len); chunk_istcat(params->p, p);
} }
if (!(params->mask & FCGI_SP_REQ_URI)) { if (!(params->mask & FCGI_SP_REQ_URI)) {
p = h1_get_uri(sl); p = h1_get_uri(sl);
params->uri = ist2(b_tail(params->p), p.len); params->uri = ist2(b_tail(params->p), p.len);
chunk_memcat(params->p, p.ptr, p.len); chunk_istcat(params->p, p);
} }
if (!(params->mask & FCGI_SP_SRV_PROTO)) { if (!(params->mask & FCGI_SP_SRV_PROTO)) {
p = htx_sl_req_vsn(sl); p = htx_sl_req_vsn(sl);
params->vsn = ist2(b_tail(params->p), p.len); params->vsn = ist2(b_tail(params->p), p.len);
chunk_memcat(params->p, p.ptr, p.len); chunk_istcat(params->p, p);
} }
if (!(params->mask & FCGI_SP_SRV_PORT)) { if (!(params->mask & FCGI_SP_SRV_PORT)) {
char *end; char *end;
@ -1361,7 +1361,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
/* Decode the path. it must first be copied to keep the URI /* Decode the path. it must first be copied to keep the URI
* untouched. * untouched.
*/ */
chunk_memcat(params->p, path.ptr, path.len); chunk_istcat(params->p, path);
path.ptr = b_tail(params->p) - path.len; path.ptr = b_tail(params->p) - path.len;
len = url_decode(ist0(path), 0); len = url_decode(ist0(path), 0);
if (len < 0) if (len < 0)
@ -1415,7 +1415,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
struct ist sn = params->scriptname; struct ist sn = params->scriptname;
params->scriptname = ist2(b_tail(params->p), len+fconn->app->index.len); params->scriptname = ist2(b_tail(params->p), len+fconn->app->index.len);
chunk_memcat(params->p, sn.ptr, sn.len); chunk_istcat(params->p, sn);
chunk_memcat(params->p, fconn->app->index.ptr, fconn->app->index.len); chunk_memcat(params->p, fconn->app->index.ptr, fconn->app->index.len);
} }
} }

4
src/tcpcheck.c
View File

@ -429,7 +429,7 @@ static void tcpcheck_expect_onerror_message(struct buffer *msg, struct check *ch
* 4. Otherwise produce the generic tcp-check info message * 4. Otherwise produce the generic tcp-check info message
*/ */
if (istlen(info)) { if (istlen(info)) {
chunk_strncat(msg, istptr(info), istlen(info)); chunk_istcat(msg, info);
goto comment; goto comment;
} }
else if (!LIST_ISEMPTY(&rule->expect.onerror_fmt)) { else if (!LIST_ISEMPTY(&rule->expect.onerror_fmt)) {
@ -517,7 +517,7 @@ static void tcpcheck_expect_onsuccess_message(struct buffer *msg, struct check *
* 4. Otherwise produce the generic tcp-check info message * 4. Otherwise produce the generic tcp-check info message
*/ */
if (istlen(info)) if (istlen(info))
chunk_strncat(msg, istptr(info), istlen(info)); chunk_istcat(msg, info);
if (!LIST_ISEMPTY(&rule->expect.onsuccess_fmt)) if (!LIST_ISEMPTY(&rule->expect.onsuccess_fmt))
msg->data += sess_build_logline(check->sess, NULL, b_tail(msg), b_room(msg), msg->data += sess_build_logline(check->sess, NULL, b_tail(msg), b_room(msg),
&rule->expect.onsuccess_fmt); &rule->expect.onsuccess_fmt);