mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: tools: Make errptr const in parse_line()

Browse Source 
This change is for consistency with `cfg_eval_condition()`.
This commit is contained in:
Maximilian Mader 2021-06-06 00:50:21 +02:00 committed by Willy Tarreau
parent b3168b34a9
commit 29c6cd7d8a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/tools.h
View File

@ -891,7 +891,7 @@ int my_unsetenv(const char *name);
* some expansion is made. * some expansion is made.
*/ */
char *env_expand(char *in); 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); size_t sanitize_for_printing(char *line, size_t pos, size_t width);
void update_word_fingerprint(uint8_t *fp, const char *word); void update_word_fingerprint(uint8_t *fp, const char *word);
void make_word_fingerprint(uint8_t *fp, const char *word); void make_word_fingerprint(uint8_t *fp, const char *word);

2
src/cfgparse.c
View File

@ -1959,7 +1959,7 @@ next_line:
while (1) { while (1) {
uint32_t err; uint32_t err;
char *errptr; const char *errptr;
arg = sizeof(args) / sizeof(*args); arg = sizeof(args) / sizeof(*args);
outlen = outlinesize; outlen = outlinesize;

2
src/tools.c
View File

@ -5183,7 +5183,7 @@ void ha_generate_uuid(struct buffer *output)
* the string. One solution for the caller may consist in replacing all args * the string. One solution for the caller may consist in replacing all args
* delimiters with spaces in this case. * 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 *quote = NULL;
char *brace = NULL; char *brace = NULL;