X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re.c;h=6ac5182517d8e5262818ed3e6abc331c6a21bac3;hb=833dc6c2a9c47b821548b197a1d1f96f60df7de8;hp=cc14baf3d64bf7884df72d32711b312f99f5b049;hpb=d20c243f3d86cc66c601a512aa1ee70ae8033bef;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c
index cc14baf..6ac5182 100644
--- a/lib/ecoli_node_re.c
+++ b/lib/ecoli_node_re.c
@@ -1,28 +1,5 @@
-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
  */
 
 #include <stdio.h>
@@ -36,8 +13,8 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
 #include <ecoli_node_re.h>
 
 EC_LOG_TYPE_REGISTER(node_re);
@@ -50,7 +27,7 @@ struct ec_node_re {
 
 static int
 ec_node_re_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_re *node = (struct ec_node_re *)gen_node;
@@ -60,13 +37,13 @@ ec_node_re_parse(const struct ec_node *gen_node,
 	(void)state;
 
 	if (ec_strvec_len(strvec) == 0)
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 
 	str = ec_strvec_val(strvec, 0);
 	if (regexec(&node->re, str, 1, &pos, 0) != 0)
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 	if (pos.rm_so != 0 || pos.rm_eo != (int)strlen(str))
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 
 	return 1;
 }
@@ -84,7 +61,7 @@ static void ec_node_re_free_priv(struct ec_node *gen_node)
 static struct ec_node_type ec_node_re_type = {
 	.name = "re",
 	.parse = ec_node_re_parse,
-	.complete = ec_node_default_complete,
+	.complete = ec_node_complete_unknown,
 	.size = sizeof(struct ec_node_re),
 	.free_priv = ec_node_re_free_priv,
 };
@@ -98,17 +75,20 @@ int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str)
 	regex_t re;
 	int ret;
 
-	if (str == NULL)
-		return -EINVAL;
+	EC_CHECK_ARG(str != NULL, -1, EINVAL);
 
-	ret = -ENOMEM;
 	str_copy = ec_strdup(str);
 	if (str_copy == NULL)
 		goto fail;
 
-	ret = -EINVAL;
-	if (regcomp(&re, str_copy, REG_EXTENDED) != 0)
+	ret = regcomp(&re, str_copy, REG_EXTENDED);
+	if (ret != 0) {
+		if (ret == REG_ESPACE)
+			errno = ENOMEM;
+		else
+			errno = EINVAL;
 		goto fail;
+	}
 
 	if (node->re_str != NULL) {
 		ec_free(node->re_str);
@@ -121,14 +101,14 @@ int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str)
 
 fail:
 	ec_free(str_copy);
-	return ret;
+	return -1;
 }
 
 struct ec_node *ec_node_re(const char *id, const char *re_str)
 {
 	struct ec_node *gen_node = NULL;
 
-	gen_node = __ec_node(&ec_node_re_type, id);
+	gen_node = ec_node_from_type(&ec_node_re_type, id);
 	if (gen_node == NULL)
 		goto fail;