From daf07f5bef526b5836a05e9fad2f448e121e21f8 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Tue, 7 Aug 2018 12:09:42 +0200 Subject: [PATCH] isl_union_*_n_*: return isl_size This improves consistency and fixes error handling. In particular, the callers were assuming that these functions return a negative value in case of error, but they did not. Signed-off-by: Sven Verdoolaege --- doc/user.pod | 8 ++++---- include/isl/aff.h | 4 ++-- include/isl/polynomial.h | 4 ++-- isl_union_multi.c | 4 ++-- isl_union_single.c | 4 ++-- isl_union_templ.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/user.pod b/doc/user.pod index 6e3b95e1..57388996 100644 --- a/doc/user.pod +++ b/doc/user.pod @@ -3465,13 +3465,13 @@ To iterate over the base expressions in a union expression, use the following functions. #include - int isl_union_pw_aff_n_pw_aff( + isl_size isl_union_pw_aff_n_pw_aff( __isl_keep isl_union_pw_aff *upa); isl_stat isl_union_pw_aff_foreach_pw_aff( __isl_keep isl_union_pw_aff *upa, isl_stat (*fn)(__isl_take isl_pw_aff *pa, void *user), void *user); - int isl_union_pw_multi_aff_n_pw_multi_aff( + isl_size isl_union_pw_multi_aff_n_pw_multi_aff( __isl_keep isl_union_pw_multi_aff *upma); isl_stat isl_union_pw_multi_aff_foreach_pw_multi_aff( __isl_keep isl_union_pw_multi_aff *upma, @@ -3479,13 +3479,13 @@ use the following functions. void *user), void *user); #include - int isl_union_pw_qpolynomial_n_pw_qpolynomial( + isl_size isl_union_pw_qpolynomial_n_pw_qpolynomial( __isl_keep isl_union_pw_qpolynomial *upwqp); isl_stat isl_union_pw_qpolynomial_foreach_pw_qpolynomial( __isl_keep isl_union_pw_qpolynomial *upwqp, isl_stat (*fn)(__isl_take isl_pw_qpolynomial *pwqp, void *user), void *user); - int isl_union_pw_qpolynomial_fold_n_pw_qpolynomial_fold( + isl_size isl_union_pw_qpolynomial_fold_n_pw_qpolynomial_fold( __isl_keep isl_union_pw_qpolynomial_fold *upwf); isl_stat isl_union_pw_qpolynomial_fold_foreach_pw_qpolynomial_fold( __isl_keep isl_union_pw_qpolynomial_fold *upwf, diff --git a/include/isl/aff.h b/include/isl/aff.h index e52811a3..b55dbc20 100644 --- a/include/isl/aff.h +++ b/include/isl/aff.h @@ -711,7 +711,7 @@ isl_union_pw_multi_aff_pullback_union_pw_multi_aff( __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_align_params( __isl_take isl_union_pw_multi_aff *upma, __isl_take isl_space *model); -int isl_union_pw_multi_aff_n_pw_multi_aff( +isl_size isl_union_pw_multi_aff_n_pw_multi_aff( __isl_keep isl_union_pw_multi_aff *upma); isl_stat isl_union_pw_multi_aff_foreach_pw_multi_aff( @@ -894,7 +894,7 @@ __isl_constructor __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_from_union_pw_aff( __isl_take isl_union_pw_aff *upa); -int isl_union_pw_aff_n_pw_aff(__isl_keep isl_union_pw_aff *upa); +isl_size isl_union_pw_aff_n_pw_aff(__isl_keep isl_union_pw_aff *upa); isl_stat isl_union_pw_aff_foreach_pw_aff(__isl_keep isl_union_pw_aff *upa, isl_stat (*fn)(__isl_take isl_pw_aff *pa, void *user), void *user); diff --git a/include/isl/polynomial.h b/include/isl/polynomial.h index f4ee27bc..24574995 100644 --- a/include/isl/polynomial.h +++ b/include/isl/polynomial.h @@ -578,7 +578,7 @@ __isl_give isl_union_pw_qpolynomial *isl_union_pw_qpolynomial_align_params( __isl_take isl_union_pw_qpolynomial *upwqp, __isl_take isl_space *model); -int isl_union_pw_qpolynomial_n_pw_qpolynomial( +isl_size isl_union_pw_qpolynomial_n_pw_qpolynomial( __isl_keep isl_union_pw_qpolynomial *upwqp); isl_stat isl_union_pw_qpolynomial_foreach_pw_qpolynomial( __isl_keep isl_union_pw_qpolynomial *upwqp, @@ -683,7 +683,7 @@ __isl_give isl_union_pw_qpolynomial_fold *isl_union_pw_qpolynomial_fold_align_pa __isl_take isl_union_pw_qpolynomial_fold *upwf, __isl_take isl_space *model); -int isl_union_pw_qpolynomial_fold_n_pw_qpolynomial_fold( +isl_size isl_union_pw_qpolynomial_fold_n_pw_qpolynomial_fold( __isl_keep isl_union_pw_qpolynomial_fold *upwf); isl_stat isl_union_pw_qpolynomial_fold_foreach_pw_qpolynomial_fold( __isl_keep isl_union_pw_qpolynomial_fold *upwf, diff --git a/isl_union_multi.c b/isl_union_multi.c index 64834e6f..c33d1c96 100644 --- a/isl_union_multi.c +++ b/isl_union_multi.c @@ -93,13 +93,13 @@ static isl_stat FN(UNION,count_part)(__isl_keep S(UNION,group) *group, /* Return the number of base expressions in "u". */ -int FN(FN(UNION,n),BASE)(__isl_keep UNION *u) +isl_size FN(FN(UNION,n),BASE)(__isl_keep UNION *u) { int n; n = 0; if (FN(UNION,foreach_group)(u, &FN(UNION,count_part), &n) < 0) - n = -1; + return isl_size_error; return n; } diff --git a/isl_union_single.c b/isl_union_single.c index c9926c8a..82bf865a 100644 --- a/isl_union_single.c +++ b/isl_union_single.c @@ -29,9 +29,9 @@ struct UNION { /* Return the number of base expressions in "u". */ -int FN(FN(UNION,n),BASE)(__isl_keep UNION *u) +isl_size FN(FN(UNION,n),BASE)(__isl_keep UNION *u) { - return u ? u->table.n : 0; + return u ? u->table.n : isl_size_error; } S(UNION,foreach_data) diff --git a/isl_union_templ.c b/isl_union_templ.c index 9943fd22..a4851aab 100644 --- a/isl_union_templ.c +++ b/isl_union_templ.c @@ -990,7 +990,7 @@ static isl_stat FN(UNION,plain_is_equal_entry)(void **entry, void *user) isl_bool FN(UNION,plain_is_equal)(__isl_keep UNION *u1, __isl_keep UNION *u2) { S(UNION,plain_is_equal_data) data = { NULL, isl_bool_true }; - int n1, n2; + isl_size n1, n2; if (!u1 || !u2) return isl_bool_error; @@ -1189,7 +1189,7 @@ static isl_stat FN(UNION,add_to_list)(void **entry, void *user) */ __isl_give LIST(PART) *FN(FN(UNION,get),LIST(BASE))(__isl_keep UNION *u) { - int n; + isl_size n; LIST(PART) *list; if (!u) -- 2.11.4.GIT