isl_union_pw_*_free: return NULL

Returning NULL helps to simplify error handling code.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/doc/user.pod b/doc/user.pod
index 048ac2c..f511fbb 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -3557,7 +3557,7 @@ functions.
 
        __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_copy(
                __isl_keep isl_union_pw_qpolynomial *upwqp);
-       void isl_union_pw_qpolynomial_free(
+       void *isl_union_pw_qpolynomial_free(
                __isl_take isl_union_pw_qpolynomial *upwqp);
 
 =head3 Inspecting (Piecewise) Quasipolynomials
@@ -3816,7 +3816,7 @@ following functions.
                __isl_take isl_qpolynomial_fold *fold);
        void *isl_pw_qpolynomial_fold_free(
                __isl_take isl_pw_qpolynomial_fold *pwf);
-       void isl_union_pw_qpolynomial_fold_free(
+       void *isl_union_pw_qpolynomial_fold_free(
                __isl_take isl_union_pw_qpolynomial_fold *upwf);
 
 =head3 Printing Piecewise Quasipolynomial Reductions

diff --git a/include/isl/polynomial.h b/include/isl/polynomial.h
index b5db847..6354c60 100644 (file)
--- a/include/isl/polynomial.h
+++ b/include/isl/polynomial.h
@@ -445,7 +445,7 @@ __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_add_pw_qpolynomial
        __isl_take isl_pw_qpolynomial *pwqp);
 __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_copy(
        __isl_keep isl_union_pw_qpolynomial *upwqp);
-void isl_union_pw_qpolynomial_free(__isl_take isl_union_pw_qpolynomial *upwqp);
+void *isl_union_pw_qpolynomial_free(__isl_take isl_union_pw_qpolynomial *upwqp);
 
 __isl_constructor
 __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_read_from_str(
@@ -513,7 +513,7 @@ __isl_give isl_union_pw_qpolynomial_fold *isl_union_pw_qpolynomial_fold_zero(
 __isl_give isl_union_pw_qpolynomial_fold *isl_union_pw_qpolynomial_fold_fold_pw_qpolynomial_fold(
        __isl_take isl_union_pw_qpolynomial_fold *upwqp,
        __isl_take isl_pw_qpolynomial_fold *pwqp);
-void isl_union_pw_qpolynomial_fold_free(
+void *isl_union_pw_qpolynomial_fold_free(
        __isl_take isl_union_pw_qpolynomial_fold *upwf);
 __isl_give isl_union_pw_qpolynomial_fold *isl_union_pw_qpolynomial_fold_copy(
        __isl_keep isl_union_pw_qpolynomial_fold *upwf);

diff --git a/isl_union_templ.c b/isl_union_templ.c
index 498badf..7da2601 100644 (file)
--- a/isl_union_templ.c
+++ b/isl_union_templ.c
@@ -244,18 +244,19 @@ static int free_u_entry(void **entry, void *user)
        return 0;
 }
 
-void FN(UNION,free)(__isl_take UNION *u)
+void *FN(UNION,free)(__isl_take UNION *u)
 {
        if (!u)
-               return;
+               return NULL;
 
        if (--u->ref > 0)
-               return;
+               return NULL;
 
        isl_hash_table_foreach(u->dim->ctx, &u->table, &free_u_entry, NULL);
        isl_hash_table_clear(&u->table);
        isl_space_free(u->dim);
        free(u);
+       return NULL;
 }
 
 S(UNION,align) {