CLEANUP: tools: Make errptr const in `parse_line()`

This change is for consistency with `cfg_eval_condition()`.

diff --git a/include/haproxy/tools.h b/include/haproxy/tools.h
index 2e3adf2f7758746d66c970b1524f106855c5a6ba..e376a716e17006ba9e5c9aa209bb6471f927e3e5 100644 (file)
--- a/include/haproxy/tools.h
+++ b/include/haproxy/tools.h
@@ -891,7 +891,7 @@ int my_unsetenv(const char *name);
  * some expansion is made.
  */
 char *env_expand(char *in);
-uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbargs, uint32_t opts, char **errptr);
+uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbargs, uint32_t opts, const char **errptr);
 size_t sanitize_for_printing(char *line, size_t pos, size_t width);
 void update_word_fingerprint(uint8_t *fp, const char *word);
 void make_word_fingerprint(uint8_t *fp, const char *word);

diff --git a/src/cfgparse.c b/src/cfgparse.c
index fa2072a83173bfa095dee6e6795c88a226ceb3e1..0f8ad579d8654f39a23446fda59b742c9a0a687c 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1959,7 +1959,7 @@ next_line:
 
                while (1) {
                        uint32_t err;
-                       char *errptr;
+                       const char *errptr;
 
                        arg = sizeof(args) / sizeof(*args);
                        outlen = outlinesize;

diff --git a/src/tools.c b/src/tools.c
index 718bb49b8fa10c4b8b2bb33755b0d4894b25043d..bd6bf4edc065a61f11280d9e35d88d3ca49eea45 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -5183,7 +5183,7 @@ void ha_generate_uuid(struct buffer *output)
  * the string. One solution for the caller may consist in replacing all args
  * delimiters with spaces in this case.
  */
-uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbargs, uint32_t opts, char **errptr)
+uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbargs, uint32_t opts, const char **errptr)
 {
        char *quote = NULL;
        char *brace = NULL;