X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re.c;h=05db0489fe70d703be64b4a90cf5e6f1e4deda25;hb=48570f34e53592d7725e00e1d1e75cc28d293914;hp=ee381d2c627d6d8c00d731f49b2361f5724fc35c;hpb=8df9723e4c3a2bb0ba89a8f5a70c319c7702935f;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c
index ee381d2..05db048 100644
--- a/lib/ecoli_node_re.c
+++ b/lib/ecoli_node_re.c
@@ -75,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);
@@ -98,7 +101,7 @@ 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)