CLEANUP: chunk: remove misleading chunk_strncat() function

This function claims to perform an strncat()-like operation but it does
not, it always copies the indicated number of bytes, regardless of the
presence of a NUL character (what is currently done by chunk_memcat()).
Let's remove it and explicitly replace it with chunk_memcat().

diff --git a/include/haproxy/chunk.h b/include/haproxy/chunk.h
index 05fd161217006119aab0304625689940851adae1..b5d515170e7a8735af6de187609f0888072f07d4 100644 (file)
--- a/include/haproxy/chunk.h
+++ b/include/haproxy/chunk.h
@@ -203,14 +203,6 @@ static inline int chunk_strcat(struct buffer *chk, const char *str)
        return 1;
 }
 
-/* appends <nb> characters from str after <chk>.
- * Returns 0 in case of failure.
- */
-static inline int chunk_strncat(struct buffer *chk, const char *str, int nb)
-{
-       return chunk_memcat(chk, str, nb);
-}
-
 /* Adds a trailing zero to the current chunk and returns the pointer to the
  * following part. The purpose is to be able to use a chunk as a series of
  * short independent strings with chunk_* functions, which do not need to be

diff --git a/src/cache.c b/src/cache.c
index ee42947c12d418d92ceee39812ebbc95d3968cd2..9c108ae5370ba767a6e05ece9a29bfc320a0855a 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -779,8 +779,8 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
                if (value) {
                        struct buffer *chk = get_trash_chunk();
 
-                       chunk_strncat(chk, value, ctx.value.len - 8 + 1);
-                       chunk_strncat(chk, "", 1);
+                       chunk_memcat(chk, value, ctx.value.len - 8 + 1);
+                       chunk_memcat(chk, "", 1);
                        offset = (*chk->area == '"') ? 1 : 0;
                        smaxage = strtol(chk->area + offset, &endptr, 10);
                        if (unlikely(smaxage < 0 || endptr == chk->area))
@@ -791,8 +791,8 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
                if (value) {
                        struct buffer *chk = get_trash_chunk();
 
-                       chunk_strncat(chk, value, ctx.value.len - 7 + 1);
-                       chunk_strncat(chk, "", 1);
+                       chunk_memcat(chk, value, ctx.value.len - 7 + 1);
+                       chunk_memcat(chk, "", 1);
                        offset = (*chk->area == '"') ? 1 : 0;
                        maxage = strtol(chk->area + offset, &endptr, 10);
                        if (unlikely(maxage < 0 || endptr == chk->area))