CLEANUP: sample: report "converter" instead of "conv method" in error messages

This was inherited from the very early stick-tables code but it's about
time to produce understandable error messages :-)

diff --git a/src/acl.c b/src/acl.c
index df83ef4d48b165fd4aaaccf3863d0c19e7e3a346..43b7b0b05eafd95ee1bee30c242632a7e26742df 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -242,7 +242,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
 
                        if (*arg && *arg != ',') {
                                if (ckw)
-                                       memprintf(err, "ACL keyword '%s' : missing comma after conv keyword '%s'.",
+                                       memprintf(err, "ACL keyword '%s' : missing comma after converter '%s'.",
                                                  aclkw->kw, ckw);
                                else
                                        memprintf(err, "ACL keyword '%s' : missing comma after fetch keyword.",
@@ -253,7 +253,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                        while (*arg == ',') /* then trailing commas */
                                arg++;
 
-                       begw = arg; /* start of conv keyword */
+                       begw = arg; /* start of converter keyword */
 
                        if (!*begw)
                                /* none ? end of converters */
@@ -267,7 +267,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                        conv = find_sample_conv(begw, endw - begw);
                        if (!conv) {
                                /* Unknown converter method */
-                               memprintf(err, "ACL keyword '%s' : unknown conv method '%s'.",
+                               memprintf(err, "ACL keyword '%s' : unknown converter '%s'.",
                                          aclkw->kw, ckw);
                                goto out_free_smp;
                        }
@@ -278,21 +278,21 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                                while (*arg && *arg != ')')
                                        arg++;
                                if (*arg != ')') {
-                                       memprintf(err, "ACL keyword '%s' : syntax error: missing ')' after conv keyword '%s'.",
+                                       memprintf(err, "ACL keyword '%s' : syntax error: missing ')' after converter '%s'.",
                                                  aclkw->kw, ckw);
                                        goto out_free_smp;
                                }
                        }
 
                        if (conv->in_type >= SMP_TYPES || conv->out_type >= SMP_TYPES) {
-                               memprintf(err, "ACL keyword '%s' : returns type of conv method '%s' is unknown.",
+                               memprintf(err, "ACL keyword '%s' : returns type of converter '%s' is unknown.",
                                          aclkw->kw, ckw);
                                goto out_free_smp;
                        }
 
                        /* If impossible type conversion */
                        if (!sample_casts[cur_type][conv->in_type]) {
-                               memprintf(err, "ACL keyword '%s' : conv method '%s' cannot be applied.",
+                               memprintf(err, "ACL keyword '%s' : converter '%s' cannot be applied.",
                                          aclkw->kw, ckw);
                                goto out_free_smp;
                        }
@@ -310,7 +310,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                                int err_arg;
 
                                if (!conv->arg_mask) {
-                                       memprintf(err, "ACL keyword '%s' : conv method '%s' does not support any args.",
+                                       memprintf(err, "ACL keyword '%s' : converter '%s' does not support any args.",
                                                  aclkw->kw, ckw);
                                        goto out_free_smp;
                                }
@@ -318,7 +318,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                                al->kw = smp->fetch->kw;
                                al->conv = conv_expr->conv->kw;
                                if (make_arg_list(endw + 1, arg - endw - 1, conv->arg_mask, &conv_expr->arg_p, err, NULL, &err_arg, al) < 0) {
-                                       memprintf(err, "ACL keyword '%s' : invalid arg %d in conv method '%s' : %s.",
+                                       memprintf(err, "ACL keyword '%s' : invalid arg %d in converter '%s' : %s.",
                                                  aclkw->kw, err_arg+1, ckw, *err);
                                        goto out_free_smp;
                                }
@@ -327,13 +327,13 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
                                        conv_expr->arg_p = empty_arg_list;
 
                                if (conv->val_args && !conv->val_args(conv_expr->arg_p, conv, file, line, err)) {
-                                       memprintf(err, "ACL keyword '%s' : invalid args in conv method '%s' : %s.",
+                                       memprintf(err, "ACL keyword '%s' : invalid args in converter '%s' : %s.",
                                                  aclkw->kw, ckw, *err);
                                        goto out_free_smp;
                                }
                        }
                        else if (ARGM(conv->arg_mask)) {
-                               memprintf(err, "ACL keyword '%s' : missing args for conv method '%s'.",
+                               memprintf(err, "ACL keyword '%s' : missing args for converter '%s'.",
                                          aclkw->kw, ckw);
                                goto out_free_smp;
                        }

diff --git a/src/sample.c b/src/sample.c
index 889ec0ca47986052a062f0a51e1ee5134743c7cb..81349cddef94dcddd63b0db951cf56abe795ccdf 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -918,7 +918,7 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
 
                if (*endt && *endt != ',') {
                        if (ckw)
-                               memprintf(err_msg, "missing comma after conv keyword '%s'", ckw);
+                               memprintf(err_msg, "missing comma after converter '%s'", ckw);
                        else
                                memprintf(err_msg, "missing comma after fetch keyword '%s'", fkw);
                        goto out_error;
@@ -927,7 +927,7 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
                while (*endt == ',') /* then trailing commas */
                        endt++;
 
-               begw = endt; /* start of conv keyword */
+               begw = endt; /* start of converter */
 
                if (!*begw) {
                        /* none ? skip to next string */
@@ -947,7 +947,7 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
                        /* we found an isolated keyword that we don't know, it's not ours */
                        if (begw == str[*idx])
                                break;
-                       memprintf(err_msg, "unknown conv method '%s'", ckw);
+                       memprintf(err_msg, "unknown converter '%s'", ckw);
                        goto out_error;
                }
 
@@ -957,19 +957,19 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
                        while (*endt && *endt != ')')
                                endt++;
                        if (*endt != ')') {
-                               memprintf(err_msg, "syntax error: missing ')' after conv keyword '%s'", ckw);
+                               memprintf(err_msg, "syntax error: missing ')' after converter '%s'", ckw);
                                goto out_error;
                        }
                }
 
                if (conv->in_type >= SMP_TYPES || conv->out_type >= SMP_TYPES) {
-                       memprintf(err_msg, "returns type of conv method '%s' is unknown", ckw);
+                       memprintf(err_msg, "returns type of converter '%s' is unknown", ckw);
                        goto out_error;
                }
 
                /* If impossible type conversion */
                if (!sample_casts[prev_type][conv->in_type]) {
-                       memprintf(err_msg, "conv method '%s' cannot be applied", ckw);
+                       memprintf(err_msg, "converter '%s' cannot be applied", ckw);
                        goto out_error;
                }
 
@@ -985,14 +985,14 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
                        int err_arg;
 
                        if (!conv->arg_mask) {
-                               memprintf(err_msg, "conv method '%s' does not support any args", ckw);
+                               memprintf(err_msg, "converter '%s' does not support any args", ckw);
                                goto out_error;
                        }
 
                        al->kw = expr->fetch->kw;
                        al->conv = conv_expr->conv->kw;
                        if (make_arg_list(endw + 1, endt - endw - 1, conv->arg_mask, &conv_expr->arg_p, err_msg, NULL, &err_arg, al) < 0) {
-                               memprintf(err_msg, "invalid arg %d in conv method '%s' : %s", err_arg+1, ckw, *err_msg);
+                               memprintf(err_msg, "invalid arg %d in converter '%s' : %s", err_arg+1, ckw, *err_msg);
                                goto out_error;
                        }
 
@@ -1000,12 +1000,12 @@ struct sample_expr *sample_parse_expr(char **str, int *idx, const char *file, in
                                conv_expr->arg_p = empty_arg_list;
 
                        if (conv->val_args && !conv->val_args(conv_expr->arg_p, conv, file, line, err_msg)) {
-                               memprintf(err_msg, "invalid args in conv method '%s' : %s", ckw, *err_msg);
+                               memprintf(err_msg, "invalid args in converter '%s' : %s", ckw, *err_msg);
                                goto out_error;
                        }
                }
                else if (ARGM(conv->arg_mask)) {
-                       memprintf(err_msg, "missing args for conv method '%s'", ckw);
+                       memprintf(err_msg, "missing args for converter '%s'", ckw);
                        goto out_error;
                }
        }