don't do code coverage on main.C

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

diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c
index ea7254b..cbbeb34 100644 (file)
--- 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>
@@ -75,8 +52,10 @@ static void ec_node_re_free_priv(struct ec_node *gen_node)
 {
        struct ec_node_re *node = (struct ec_node_re *)gen_node;
 
-       ec_free(node->re_str);
-       regfree(&node->re);
+       if (node->re_str != NULL) {
+               ec_free(node->re_str);
+               regfree(&node->re);
+       }
 }
 
 static struct ec_node_type ec_node_re_type = {
@@ -92,26 +71,33 @@ EC_NODE_TYPE_REGISTER(ec_node_re_type);
 int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str)
 {
        struct ec_node_re *node = (struct ec_node_re *)gen_node;
+       char *str_copy = NULL;
+       regex_t re;
        int ret;
 
        if (str == NULL)
                return -EINVAL;
-       if (node->re_str != NULL) // XXX allow to replace
-               return -EEXIST;
 
        ret = -ENOMEM;
-       node->re_str = ec_strdup(str);
-       if (node->re_str == NULL)
+       str_copy = ec_strdup(str);
+       if (str_copy == NULL)
                goto fail;
 
        ret = -EINVAL;
-       if (regcomp(&node->re, node->re_str, REG_EXTENDED) != 0)
+       if (regcomp(&re, str_copy, REG_EXTENDED) != 0)
                goto fail;
 
+       if (node->re_str != NULL) {
+               ec_free(node->re_str);
+               regfree(&node->re);
+       }
+       node->re_str = str_copy;
+       node->re = re;
+
        return 0;
 
 fail:
-       ec_free(node->re_str);
+       ec_free(str_copy);
        return ret;
 }