use EC_NO_ID instead of NULL

[protos/libecoli.git] / lib / ecoli_node_empty.c

diff --git a/lib/ecoli_node_empty.c b/lib/ecoli_node_empty.c
index e52956e..2f7600a 100644 (file)
--- a/lib/ecoli_node_empty.c
+++ b/lib/ecoli_node_empty.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include <ecoli_malloc.h>
 #include <ecoli_log.h>
@@ -38,33 +39,20 @@
 #include <ecoli_completed.h>
 #include <ecoli_node_empty.h>
 
+EC_LOG_TYPE_REGISTER(node_empty);
+
 struct ec_node_empty {
        struct ec_node gen;
 };
 
-static struct ec_parsed *ec_node_empty_parse(const struct ec_node *gen_node,
-       const struct ec_strvec *strvec)
+static int ec_node_empty_parse(const struct ec_node *gen_node,
+                       struct ec_parsed *state,
+                       const struct ec_strvec *strvec)
 {
-       struct ec_parsed *parsed;
-       struct ec_strvec *match_strvec;
-
+       (void)gen_node;
+       (void)state;
        (void)strvec;
-
-       parsed = ec_parsed();
-       if (parsed == NULL)
-               goto fail;
-
-       match_strvec = ec_strvec();
-       if (match_strvec == NULL)
-               goto fail;
-
-       ec_parsed_set_match(parsed, gen_node, match_strvec);
-
-       return parsed;
-
- fail:
-       ec_parsed_free(parsed);
-       return NULL;
+       return 0;
 }
 
 static struct ec_node_type ec_node_empty_type = {
@@ -76,14 +64,15 @@ static struct ec_node_type ec_node_empty_type = {
 
 EC_NODE_TYPE_REGISTER(ec_node_empty_type);
 
+/* LCOV_EXCL_START */
 static int ec_node_empty_testcase(void)
 {
        struct ec_node *node;
        int ret = 0;
 
-       node = ec_node("empty", NULL);
+       node = ec_node("empty", EC_NO_ID);
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_PARSE(node, 0, "foo");
@@ -92,23 +81,22 @@ static int ec_node_empty_testcase(void)
        ec_node_free(node);
 
        /* never completes */
-       node = ec_node("empty", NULL);
+       node = ec_node("empty", EC_NO_ID);
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ec_node_free(node);
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_empty_test = {
        .name = "node_empty",