libsmartcols: (filter) cleanup function arguments

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libsmartcols/src/filter-expr.c b/libsmartcols/src/filter-expr.c
index 9ea4e6b7beea172892454ee8ab9370a0e0dd176a..acbf09badf89552f09a68c30ce669136ea4657cd 100644 (file)
--- a/libsmartcols/src/filter-expr.c
+++ b/libsmartcols/src/filter-expr.c
@@ -86,9 +86,8 @@ void filter_dump_expr(struct ul_jsonwrt *json, struct filter_expr *n)
        ul_jsonwrt_object_close(json);
 }
 
-
-int filter_eval_expr(struct libscols_filter *fltr, struct filter_expr *n,
-                    struct libscols_line *ln, int *status)
+int filter_eval_expr(struct libscols_filter *fltr, struct libscols_line *ln,
+                       struct filter_expr *n, int *status)
 {
        int rc = 0;
        struct filter_param *l = NULL, *r = NULL;
@@ -97,17 +96,17 @@ int filter_eval_expr(struct libscols_filter *fltr, struct filter_expr *n,
        /* logical operators */
        switch (oper) {
        case F_EXPR_AND:
-               rc = filter_eval_node(fltr, n->left, ln, status);
+               rc = filter_eval_node(fltr, ln, n->left, status);
                if (rc == 0 && *status)
-                       rc = filter_eval_node(fltr, n->right, ln, status);
+                       rc = filter_eval_node(fltr, ln, n->right, status);
                return rc;
        case F_EXPR_OR:
-               rc = filter_eval_node(fltr, n->left, ln, status);
+               rc = filter_eval_node(fltr, ln, n->left, status);
                if (rc == 0 && !*status)
-                       rc = filter_eval_node(fltr, n->right, ln, status);
+                       rc = filter_eval_node(fltr, ln, n->right, status);
                return rc;
        case F_EXPR_NEG:
-               rc = filter_eval_node(fltr, n->right, ln, status);
+               rc = filter_eval_node(fltr, ln, n->right, status);
                if (rc == 0)
                        *status = !*status;
                return rc;

diff --git a/libsmartcols/src/filter-param.c b/libsmartcols/src/filter-param.c
index 7acd021febff89db3694b1f1e02a3b4ad3a31764..ad10ebf5516bf501de2cf468451264826d019e94 100644 (file)
--- a/libsmartcols/src/filter-param.c
+++ b/libsmartcols/src/filter-param.c
@@ -158,8 +158,8 @@ static int fetch_holder_data(struct libscols_filter *fltr,
 }
 
 int filter_eval_param(struct libscols_filter *fltr,
-               struct filter_param *n,
                struct libscols_line *ln,
+               struct filter_param *n,
                int *status)
 {
        int rc = 0;

diff --git a/libsmartcols/src/filter.c b/libsmartcols/src/filter.c
index 99201a3a8ce2598324f4199711014097ae19deb5..868fdb64df3ac247a224ca3f3978f74c7908956b 100644 (file)
--- a/libsmartcols/src/filter.c
+++ b/libsmartcols/src/filter.c
@@ -194,14 +194,14 @@ int scols_filter_assign_column(struct libscols_filter *fltr,
        return ct == 0 ? 1 : 0;
 }
 
-int filter_eval_node(struct libscols_filter *fltr, struct filter_node *n,
-                       struct libscols_line *ln, int *status)
+int filter_eval_node(struct libscols_filter *fltr, struct libscols_line *ln,
+                       struct filter_node *n, int *status)
 {
        switch (n->type) {
        case F_NODE_PARAM:
-               return filter_eval_param(fltr, (struct filter_param *) n, ln, status);
+               return filter_eval_param(fltr, ln, (struct filter_param *) n, status);
        case F_NODE_EXPR:
-               return filter_eval_expr(fltr, (struct filter_expr *) n, ln, status);
+               return filter_eval_expr(fltr, ln, (struct filter_expr *) n, status);
        default:
                break;
        }
@@ -215,7 +215,7 @@ int scols_line_apply_filter(struct libscols_line *ln,
        if (!ln || !fltr || !fltr->root)
                return -EINVAL;
 
-       rc = filter_eval_node(fltr, fltr->root, ln, status);
+       rc = filter_eval_node(fltr, ln, fltr->root, status);
 
        DBG(FLTR, ul_debugobj(fltr, "filter applid [rc=%d, status=%d]", rc, *status));
        return rc;

diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h
index 94d4f996b9519df84286da7199a982f64e6c8186..04500b238f1e6a518a6f176f8bc742b4ab9ae913 100644 (file)
--- a/libsmartcols/src/smartcolsP.h
+++ b/libsmartcols/src/smartcolsP.h
@@ -567,13 +567,13 @@ void filter_ref_node(struct filter_node *n);
 void filter_unref_node(struct filter_node *n);
 
 void filter_dump_node(struct ul_jsonwrt *json, struct filter_node *n);
-int filter_eval_node(struct libscols_filter *fltr, struct filter_node *n,
-                       struct libscols_line *ln, int *status);
+int filter_eval_node(struct libscols_filter *fltr, struct libscols_line *ln,
+                       struct filter_node *n, int *status);
 
 /* param */
 void filter_dump_param(struct ul_jsonwrt *json, struct filter_param *n);
-int filter_eval_param(struct libscols_filter *fltr, struct filter_param *n,
-                       struct libscols_line *ln, int *status);
+int filter_eval_param(struct libscols_filter *fltr, struct libscols_line *ln,
+                       struct filter_param *n, int *status);
 void filter_free_param(struct filter_param *n);
 
 int filter_next_param(struct libscols_filter *fltr,
@@ -589,8 +589,8 @@ int filter_compare_params(struct libscols_filter *fltr,
 /* expr */
 void filter_free_expr(struct filter_expr *n);
 void filter_dump_expr(struct ul_jsonwrt *json, struct filter_expr *n);
-int filter_eval_expr(struct libscols_filter *fltr, struct filter_expr *n,
-                       struct libscols_line *ln, int *status);
+int filter_eval_expr(struct libscols_filter *fltr, struct libscols_line *ln,
+                       struct filter_expr *n, int *status);
 
 /* required by parser */
 struct filter_node *filter_new_param(struct libscols_filter *filter,