MINOR: configuration: File and line propagation
This patch permits to communicate file and line of the
configuration file at the configuration parser.
diff --git a/include/proto/log.h b/include/proto/log.h
index 86b4185..e3c1a75 100644
--- a/include/proto/log.h
+++ b/include/proto/log.h
@@ -70,7 +70,7 @@
* Variable name are preceded by % and composed by characters [a-zA-Z0-9]* : %varname
* You can set arguments using { } : %{many arguments}varname
*/
-void parse_logformat_string(const char *str, struct proxy *curproxy, struct list *list_format, int options, int cap);
+void parse_logformat_string(const char *str, struct proxy *curproxy, struct list *list_format, int options, int cap, const char *file, int line);
/*
* Displays the message on stderr with the date and pid. Overrides the quiet
* mode during startup.
diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index e9269e4..4b5afe1 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -186,7 +186,7 @@
*/
void pattern_init_head(struct pattern_head *head);
void pattern_prune(struct pattern_head *head);
-int pattern_read_from_file(struct pattern_head *head, unsigned int refflags, const char *filename, int patflags, int load_smp, char **err, const char *display);
+int pattern_read_from_file(struct pattern_head *head, unsigned int refflags, const char *filename, int patflags, int load_smp, char **err, const char *display, const char *file, int line);
/*
* pattern_expr manipulation.
diff --git a/include/proto/sample.h b/include/proto/sample.h
index d78e82d..6b76662 100644
--- a/include/proto/sample.h
+++ b/include/proto/sample.h
@@ -28,7 +28,7 @@
extern const char *smp_to_type[SMP_TYPES];
-struct sample_expr *sample_parse_expr(char **str, int *idx, char **err, struct arg_list *al);
+struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, int line, char **err, struct arg_list *al);
struct sample_conv *find_sample_conv(const char *kw, int len);
struct sample *sample_process(struct proxy *px, struct session *l4,
void *l7, unsigned int dir, struct sample_expr *expr,
diff --git a/include/types/sample.h b/include/types/sample.h
index ce1bba9..a5140d6 100644
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -265,6 +265,7 @@
unsigned int arg_mask; /* arguments (ARG*()) */
int (*val_args)(struct arg *arg_p,
struct sample_conv *smp_conv,
+ const char *file, int line,
char **err_msg); /* argument validation function */
unsigned int in_type; /* expected input sample type */
unsigned int out_type; /* output sample type */