CLEANUP: Use istadv(const struct ist, const size_t) whenever possible
Refactoring performed with the following Coccinelle patch:
@@
struct ist i;
expression e;
@@
- i.ptr += e;
- i.len -= e;
+ i = istadv(i, e);
diff --git a/src/cache.c b/src/cache.c
index acd6872..12609e1 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -620,8 +620,7 @@
case HTX_BLK_DATA:
v = htx_get_blk_value(htx, blk);
- v.ptr += offset;
- v.len -= offset;
+ v = istadv(v, offset);
if (v.len > len)
v.len = len;
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 206beda..424cd00 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -143,8 +143,7 @@
}
v = htx_get_blk_value(htx, blk);
- v.ptr += offset;
- v.len -= offset;
+ v = istadv(v, offset);
offset = 0;
if (v.len > len)
diff --git a/src/htx.c b/src/htx.c
index 6a4fe2d..774727b 100644
--- a/src/htx.c
+++ b/src/htx.c
@@ -543,8 +543,7 @@
blk = tailblk;
goto end;
}
- data.ptr += len;
- data.len -= len;
+ data = istadv(data, len);
add_new_block:
/* FIXME: check data.len (< 256MB) */
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 3810943..46940b4 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5361,16 +5361,14 @@
if (len + 2 < uri.len && uri.ptr[len + 1] == '/' && uri.ptr[len + 2] == '/') {
/* make the uri start at the authority now */
scheme = ist2(uri.ptr, len);
- uri.ptr += len + 3;
- uri.len -= len + 3;
+ uri = istadv(uri, len + 3);
/* find the auth part of the URI */
auth = ist2(uri.ptr, 0);
while (auth.len < uri.len && auth.ptr[auth.len] != '/')
auth.len++;
- uri.ptr += auth.len;
- uri.len -= auth.len;
+ uri = istadv(uri, auth.len);
}
}