fix some icc warnings

diff --git a/isl_coalesce.c b/isl_coalesce.c
index 0a04a14..82bd88f 100644 (file)
--- a/isl_coalesce.c
+++ b/isl_coalesce.c
@@ -26,6 +26,7 @@ static int status_in(isl_int *ineq, struct isl_tab *tab)
 {
        enum isl_ineq_type type = isl_tab_ineq_type(tab, ineq);
        switch (type) {
+       default:
        case isl_ineq_error:            return STATUS_ERROR;
        case isl_ineq_redundant:        return STATUS_VALID;
        case isl_ineq_separate:         return STATUS_SEPARATE;

diff --git a/isl_constraint.c b/isl_constraint.c
index 5189fa5..3c71f1c 100644 (file)
--- a/isl_constraint.c
+++ b/isl_constraint.c
@@ -27,6 +27,7 @@ static unsigned offset(struct isl_constraint *c, enum isl_dim_type type)
        case isl_dim_in:        return 1 + dim->nparam;
        case isl_dim_out:       return 1 + dim->nparam + dim->n_in;
        case isl_dim_div:       return 1 + dim->nparam + dim->n_in + dim->n_out;
+       default:                return 0;
        }
 }
 
@@ -39,6 +40,7 @@ static unsigned basic_set_offset(struct isl_basic_set *bset,
        case isl_dim_in:        return 1 + dim->nparam;
        case isl_dim_out:       return 1 + dim->nparam + dim->n_in;
        case isl_dim_div:       return 1 + dim->nparam + dim->n_in + dim->n_out;
+       default:                return 0;
        }
 }
 

diff --git a/isl_dim.c b/isl_dim.c
index de53db2..05436e2 100644 (file)
--- a/isl_dim.c
+++ b/isl_dim.c
@@ -142,6 +142,7 @@ static unsigned offset(struct isl_dim *dim, enum isl_dim_type type)
        case isl_dim_param:     return 0;
        case isl_dim_in:        return dim->nparam;
        case isl_dim_out:       return dim->nparam + dim->n_in;
+       default:                return 0;
        }
 }
 
@@ -151,6 +152,7 @@ static unsigned n(struct isl_dim *dim, enum isl_dim_type type)
        case isl_dim_param:     return dim->nparam;
        case isl_dim_in:        return dim->n_in;
        case isl_dim_out:       return dim->n_out;
+       default:                return 0;
        }
 }
 

diff --git a/isl_div.c b/isl_div.c
index 68eac18..5b5f4cb 100644 (file)
--- a/isl_div.c
+++ b/isl_div.c
@@ -20,6 +20,7 @@ static unsigned n(struct isl_div *d, enum isl_dim_type type)
        case isl_dim_in:        return dim->n_in;
        case isl_dim_out:       return dim->n_out;
        case isl_dim_div:       return d->bmap->n_div;
+       default:                return 0;
        }
 }
 
@@ -36,6 +37,7 @@ static unsigned offset(struct isl_div *d, enum isl_dim_type type)
        case isl_dim_in:    return 1 + 1 + dim->nparam;
        case isl_dim_out:   return 1 + 1 + dim->nparam + dim->n_in;
        case isl_dim_div:   return 1 + 1 + dim->nparam + dim->n_in + dim->n_out;
+       default:            return 0;
        }
 }
 

diff --git a/isl_map.c b/isl_map.c
index 793b061..66612d1 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -55,6 +55,7 @@ static unsigned n(struct isl_dim *dim, enum isl_dim_type type)
        case isl_dim_in:        return dim->n_in;
        case isl_dim_out:       return dim->n_out;
        case isl_dim_all:       return dim->nparam + dim->n_in + dim->n_out;
+       default:                return 0;
        }
 }
 
@@ -64,6 +65,7 @@ static unsigned pos(struct isl_dim *dim, enum isl_dim_type type)
        case isl_dim_param:     return 1;
        case isl_dim_in:        return 1 + dim->nparam;
        case isl_dim_out:       return 1 + dim->nparam + dim->n_in;
+       default:                return 0;
        }
 }
 
@@ -120,6 +122,7 @@ unsigned isl_basic_map_dim(const struct isl_basic_map *bmap,
        case isl_dim_out:       return isl_dim_size(bmap->dim, type);
        case isl_dim_div:       return bmap->n_div;
        case isl_dim_all:       return isl_basic_map_total_dim(bmap);
+       default:                return 0;
        }
 }
 
@@ -142,6 +145,7 @@ unsigned isl_basic_map_offset(struct isl_basic_map *bmap,
        case isl_dim_in:        return 1 + dim->nparam;
        case isl_dim_out:       return 1 + dim->nparam + dim->n_in;
        case isl_dim_div:       return 1 + dim->nparam + dim->n_in + dim->n_out;
+       default:                return 0;
        }
 }
 
@@ -330,9 +334,6 @@ static struct isl_basic_map *basic_map_init(struct isl_ctx *ctx,
        bmap->sample = NULL;
 
        return bmap;
-error:
-       isl_basic_map_free(bmap);
-       return NULL;
 }
 
 struct isl_basic_set *isl_basic_set_alloc(struct isl_ctx *ctx,

diff --git a/isl_obj.c b/isl_obj.c
index 137930d..47341a0 100644 (file)
--- a/isl_obj.c
+++ b/isl_obj.c
@@ -83,6 +83,7 @@ static __isl_give isl_printer *isl_obj_none_print(__isl_take isl_printer *p,
 
 static void *isl_obj_none_add(void *v1, void *v2)
 {
+       return NULL;
 }
 
 static struct isl_obj_vtable obj_none = {

diff --git a/isl_polynomial.c b/isl_polynomial.c
index 622dcd7..8eb7e3d 100644 (file)
--- a/isl_polynomial.c
+++ b/isl_polynomial.c
@@ -21,6 +21,7 @@ static unsigned pos(__isl_keep isl_dim *dim, enum isl_dim_type type)
        case isl_dim_param:     return 0;
        case isl_dim_in:        return dim->nparam;
        case isl_dim_out:       return dim->nparam + dim->n_in;
+       default:                return 0;
        }
 }
 
@@ -315,9 +316,6 @@ __isl_give struct isl_upoly_rec *isl_upoly_alloc_rec(struct isl_ctx *ctx,
        rec->size = size;
 
        return rec;
-error:
-       isl_upoly_free(&rec->up);
-       return NULL;
 }
 
 isl_ctx *isl_qpolynomial_get_ctx(__isl_keep isl_qpolynomial *qp)
@@ -1276,9 +1274,6 @@ __isl_give isl_qpolynomial *isl_qpolynomial_cst(__isl_take isl_dim *dim,
        isl_int_set(cst->n, v);
 
        return qp;
-error:
-       isl_qpolynomial_free(qp);
-       return NULL;
 }
 
 int isl_qpolynomial_is_cst(__isl_keep isl_qpolynomial *qp,
@@ -1579,9 +1574,6 @@ __isl_give isl_qpolynomial *isl_qpolynomial_rat_cst(__isl_take isl_dim *dim,
        isl_int_set(cst->d, d);
 
        return qp;
-error:
-       isl_qpolynomial_free(qp);
-       return NULL;
 }
 
 static int up_set_active(__isl_keep struct isl_upoly *up, int *active, int d)
@@ -2537,6 +2529,7 @@ unsigned isl_term_dim(__isl_keep isl_term *term, enum isl_dim_type type)
        case isl_dim_out:       return isl_dim_size(term->dim, type);
        case isl_dim_div:       return term->div->n_row;
        case isl_dim_all:       return isl_dim_total(term->dim) + term->div->n_row;
+       default:                return 0;
        }
 }
 

diff --git a/isl_stream.c b/isl_stream.c
index 6dcdafd..5568127 100644 (file)
--- a/isl_stream.c
+++ b/isl_stream.c
@@ -370,7 +370,7 @@ static struct isl_token *next_token(struct isl_stream *s, int same_line)
                }
                if (c != -1)
                        isl_stream_ungetc(s, c);
-               tok->type = ':';
+               tok->type = (enum isl_token_type) ':';
                return tok;
        }
        if (c == '>') {

diff --git a/isl_tab.c b/isl_tab.c
index 7dccea8..d0d9c26 100644 (file)
--- a/isl_tab.c
+++ b/isl_tab.c
@@ -742,6 +742,8 @@ int isl_tab_row_is_redundant(struct isl_tab *tab, int row)
 static void swap_rows(struct isl_tab *tab, int row1, int row2)
 {
        int t;
+       enum isl_tab_row_sign s;
+
        t = tab->row_var[row1];
        tab->row_var[row1] = tab->row_var[row2];
        tab->row_var[row2] = t;
@@ -751,9 +753,9 @@ static void swap_rows(struct isl_tab *tab, int row1, int row2)
 
        if (!tab->row_sign)
                return;
-       t = tab->row_sign[row1];
+       s = tab->row_sign[row1];
        tab->row_sign[row1] = tab->row_sign[row2];
-       tab->row_sign[row2] = t;
+       tab->row_sign[row2] = s;
 }
 
 static int push_union(struct isl_tab *tab,
@@ -1643,7 +1645,7 @@ int isl_tab_add_row(struct isl_tab *tab, isl_int *line)
        isl_int_clear(b);
 
        if (tab->row_sign)
-               tab->row_sign[tab->con[r].index] = 0;
+               tab->row_sign[tab->con[r].index] = isl_tab_row_unknown;
 
        return r;
 }

diff --git a/isl_tab_pip.c b/isl_tab_pip.c
index 36c3d02..01efc6c 100644 (file)
--- a/isl_tab_pip.c
+++ b/isl_tab_pip.c
@@ -2178,10 +2178,11 @@ static enum isl_tab_row_sign tab_ineq_sign(struct isl_tab *tab, isl_int *ineq,
        int i;
        int sgn;
        isl_int tmp;
-       int res = isl_tab_row_unknown;
+       enum isl_tab_row_sign res = isl_tab_row_unknown;
 
-       isl_assert(tab->mat->ctx, tab->samples, return 0);
-       isl_assert(tab->mat->ctx, tab->samples->n_col == 1 + tab->n_var, return 0);
+       isl_assert(tab->mat->ctx, tab->samples, return isl_tab_row_unknown);
+       isl_assert(tab->mat->ctx, tab->samples->n_col == 1 + tab->n_var,
+                       return isl_tab_row_unknown);
 
        isl_int_init(tmp);
        for (i = tab->n_outside; i < tab->n_sample; ++i) {
@@ -3349,7 +3350,7 @@ static enum isl_tab_row_sign row_sign(struct isl_tab *tab,
        struct isl_sol *sol, int row)
 {
        struct isl_vec *ineq = NULL;
-       int res = isl_tab_row_unknown;
+       enum isl_tab_row_sign res = isl_tab_row_unknown;
        int critical;
        int strict;
        int row2;
@@ -3413,7 +3414,7 @@ static enum isl_tab_row_sign row_sign(struct isl_tab *tab,
        return res;
 error:
        isl_vec_free(ineq);
-       return 0;
+       return isl_tab_row_unknown;
 }
 
 static void find_solutions(struct isl_sol *sol, struct isl_tab *tab);
@@ -3597,7 +3598,7 @@ static void find_solutions(struct isl_sol *sol, struct isl_tab *tab)
        for (; tab && !tab->empty; tab = restore_lexmin(tab)) {
                int flags;
                int row;
-               int sgn;
+               enum isl_tab_row_sign sgn;
                int split = -1;
                int n_split = 0;
 

diff --git a/isl_transitive_closure.c b/isl_transitive_closure.c
index ffb14ae..72cea1f 100644 (file)
--- a/isl_transitive_closure.c
+++ b/isl_transitive_closure.c
@@ -158,10 +158,6 @@ static int check_exactness(__isl_take isl_map *map, __isl_take isl_map *app,
        isl_map_free(map);
 
        return exact;
-error:
-       isl_map_free(app);
-       isl_map_free(map);
-       return -1;
 }
 
 /*