isl_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 626a4d3..9cbab6a 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -2480,7 +2480,7 @@ functions.
 
        __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_copy(
                __isl_keep isl_pw_qpolynomial *pwqp);
-       void isl_pw_qpolynomial_free(
+       void *isl_pw_qpolynomial_free(
                __isl_take isl_pw_qpolynomial *pwqp);
 
        __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_copy(
@@ -2712,7 +2712,7 @@ following functions.
                __isl_keep isl_union_pw_qpolynomial_fold *upwf);
        void isl_qpolynomial_fold_free(
                __isl_take isl_qpolynomial_fold *fold);
-       void isl_pw_qpolynomial_fold_free(
+       void *isl_pw_qpolynomial_fold_free(
                __isl_take isl_pw_qpolynomial_fold *pwf);
        void isl_union_pw_qpolynomial_fold_free(
                __isl_take isl_union_pw_qpolynomial_fold *upwf);

diff --git a/include/isl/polynomial.h b/include/isl/polynomial.h
index a4fc7b7..6027e14 100644 (file)
--- a/include/isl/polynomial.h
+++ b/include/isl/polynomial.h
@@ -146,7 +146,7 @@ __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_alloc(__isl_take isl_set *set,
        __isl_take isl_qpolynomial *qp);
 __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_copy(
        __isl_keep isl_pw_qpolynomial *pwqp);
-void isl_pw_qpolynomial_free(__isl_take isl_pw_qpolynomial *pwqp);
+void *isl_pw_qpolynomial_free(__isl_take isl_pw_qpolynomial *pwqp);
 
 int isl_pw_qpolynomial_is_zero(__isl_keep isl_pw_qpolynomial *pwqp);
 
@@ -318,7 +318,7 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_alloc(
        __isl_take isl_set *set, __isl_take isl_qpolynomial_fold *fold);
 __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_copy(
        __isl_keep isl_pw_qpolynomial_fold *pwf);
-void isl_pw_qpolynomial_fold_free(__isl_take isl_pw_qpolynomial_fold *pwf);
+void *isl_pw_qpolynomial_fold_free(__isl_take isl_pw_qpolynomial_fold *pwf);
 
 int isl_pw_qpolynomial_fold_is_zero(__isl_keep isl_pw_qpolynomial_fold *pwf);
 

diff --git a/isl_pw_templ.c b/isl_pw_templ.c
index 4ebebcc..f337293 100644 (file)
--- a/isl_pw_templ.c
+++ b/isl_pw_templ.c
@@ -154,14 +154,14 @@ __isl_give PW *FN(PW,copy)(__isl_keep PW *pw)
        return pw;
 }
 
-void FN(PW,free)(__isl_take PW *pw)
+void *FN(PW,free)(__isl_take PW *pw)
 {
        int i;
 
        if (!pw)
-               return;
+               return NULL;
        if (--pw->ref > 0)
-               return;
+               return NULL;
 
        for (i = 0; i < pw->n; ++i) {
                isl_set_free(pw->p[i].set);
@@ -169,6 +169,8 @@ void FN(PW,free)(__isl_take PW *pw)
        }
        isl_dim_free(pw->dim);
        free(pw);
+
+       return NULL;
 }
 
 int FN(PW,is_zero)(__isl_keep PW *pw)