RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-03 10:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: log: make parse_logformat_string() take a const char *

Browse Source 
Sometimes we can't pass a char *, and there is no need for this since we strdup() it.
This commit is contained in:
Willy Tarreau 2012-12-24 12:36:33 +01:00
parent 5c2e198390
commit b83bc1e1c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/log.h
View File

@ -70,7 +70,7 @@ void add_to_logformat_list(char *start, char *end, int type, struct list *list_f
* Variable name are preceded by % and composed by characters [a-zA-Z0-9]* : %varname * Variable name are preceded by % and composed by characters [a-zA-Z0-9]* : %varname
* You can set arguments using { } : %{many arguments}varname * You can set arguments using { } : %{many arguments}varname
*/ */
void parse_logformat_string(char *str, struct proxy *curproxy, struct list *list_format, int capabilities); void parse_logformat_string(const char *str, struct proxy *curproxy, struct list *list_format, int capabilities);
/* /*
* Displays the message on stderr with the date and pid. Overrides the quiet * Displays the message on stderr with the date and pid. Overrides the quiet
* mode during startup. * mode during startup.

8
src/log.c
View File

@ -359,9 +359,9 @@ void add_sample_to_logformat_list(char *text, char *arg, int arg_len, struct pro
* list_format: the destination list * list_format: the destination list
* capabilities: PR_MODE_TCP_ | PR_MODE_HTTP * capabilities: PR_MODE_TCP_ | PR_MODE_HTTP
*/ */
void parse_logformat_string(char *fmt, struct proxy *curproxy, struct list *list_format, int capabilities) void parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list *list_format, int capabilities)
{ {
char *sp, *str; /* start pointer for text parts */ char *sp, *str, *backfmt; /* start pointer for text parts */
char *arg = NULL; /* start pointer for args */ char *arg = NULL; /* start pointer for args */
char *var = NULL; /* start pointer for vars */ char *var = NULL; /* start pointer for vars */
int arg_len = 0; int arg_len = 0;
@ -371,7 +371,7 @@ void parse_logformat_string(char *fmt, struct proxy *curproxy, struct list *list
struct logformat_node *tmplf, *back; struct logformat_node *tmplf, *back;
int options = 0; int options = 0;
sp = str = fmt = strdup(fmt); sp = str = backfmt = strdup(fmt);
curproxy->to_log |= LW_INIT; curproxy->to_log |= LW_INIT;
/* flush the list first. */ /* flush the list first. */
@ -483,7 +483,7 @@ void parse_logformat_string(char *fmt, struct proxy *curproxy, struct list *list
if (pformat == LF_STARTVAR || pformat == LF_STARG || pformat == LF_STEXPR) if (pformat == LF_STARTVAR || pformat == LF_STARG || pformat == LF_STEXPR)
Warning("Ignoring end of truncated log-format line after '%s'\n", var ? var : arg ? arg : "%"); Warning("Ignoring end of truncated log-format line after '%s'\n", var ? var : arg ? arg : "%");
free(fmt); free(backfmt);
} }
/* /*