lsfd: (filter) give a name to a constant

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/misc-utils/lsfd-filter.c b/misc-utils/lsfd-filter.c
index bf3a74799a08c0d790590949f0dad13ea47b5d7a..772924464037a4f377a4614a7e01528159ac982c 100644 (file)
--- a/misc-utils/lsfd-filter.c
+++ b/misc-utils/lsfd-filter.c
@@ -692,7 +692,7 @@ static struct node *dparser_compile1(struct parser *parser, struct node *last)
        switch (t->type) {
        case TOKEN_NAME: {
                int col_id = parser->column_name_to_id(t->val.str, parser->data);
-               if (col_id == -1) {
+               if (col_id == LSFD_FILTER_UNKNOWN_COL_ID) {
                        snprintf(parser->errmsg, ERRMSG_LEN,
                                 _("error: no such column: %s"), t->val.str);
                        token_free(t);

diff --git a/misc-utils/lsfd-filter.h b/misc-utils/lsfd-filter.h
index 22d8d4f3fdab7190cb3e3f4014b79cd584e01b6a..db5cbd6bd4b4314c88f0c4241abdf97c5ac35426 100644 (file)
--- a/misc-utils/lsfd-filter.h
+++ b/misc-utils/lsfd-filter.h
@@ -14,8 +14,16 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#define LSFD_FILTER_UNKNOWN_COL_ID -1
+
 struct lsfd_filter;
 
+/*
+ * @column_name_to_id: a function converting a column name to its id.
+ *
+ * @column_name_to_id should return LSFD_FILTER_UNKNOWN_COL_ID if
+ * an unknown column name is given.
+ */
 struct lsfd_filter *lsfd_filter_new(const char *const expr, struct libscols_table *tb,
                                      int ncols,
                                      int (*column_name_to_id)(const char *, void *),

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 223d008aad64714d3fe6d76cae522171b148b672..d586b551414a65c21fc23a323d1cbda91742ab8b 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -203,7 +203,7 @@ static int column_name_to_id(const char *name, size_t namesz)
        }
        warnx(_("unknown column: %s"), name);
 
-       return -1;
+       return LSFD_FILTER_UNKNOWN_COL_ID;
 }
 
 static int column_name_to_id_cb(const char *name, void *data __attribute__((__unused__)))