From 83c88f056b70213b886b7579fd152f2f80a43dba Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Tue, 15 Mar 2011 12:24:21 +0100 Subject: [PATCH] isl_vec_read_from_file: drop input_format argument Ideally, we should autodetect the input format and we currently only support one format anyway. Signed-off-by: Sven Verdoolaege --- include/isl/vec.h | 3 +-- isl_input.c | 12 ++++-------- polyhedron_minimize.c | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/isl/vec.h b/include/isl/vec.h index 5a2f3658..b23a6980 100644 --- a/include/isl/vec.h +++ b/include/isl/vec.h @@ -52,8 +52,7 @@ __isl_give isl_vec *isl_vec_add(__isl_take isl_vec *vec1, __isl_give isl_vec *isl_vec_extend(__isl_take isl_vec *vec, unsigned size); __isl_give isl_vec *isl_vec_zero_extend(__isl_take isl_vec *vec, unsigned size); -struct isl_vec *isl_vec_read_from_file(struct isl_ctx *ctx, - FILE *input, unsigned input_format); +__isl_give isl_vec *isl_vec_read_from_file(isl_ctx *ctx, FILE *input); #if defined(__cplusplus) } diff --git a/isl_input.c b/isl_input.c index 71e8900f..c914aa9f 100644 --- a/isl_input.c +++ b/isl_input.c @@ -2188,22 +2188,18 @@ error: return NULL; } -static __isl_give isl_vec *vec_read(struct isl_stream *s, - unsigned input_format) +static __isl_give isl_vec *vec_read(struct isl_stream *s) { - if (input_format == ISL_FORMAT_POLYLIB) - return isl_vec_read_polylib(s); - isl_assert(s->ctx, 0, return NULL); + return isl_vec_read_polylib(s); } -struct isl_vec *isl_vec_read_from_file(struct isl_ctx *ctx, - FILE *input, unsigned input_format) +__isl_give isl_vec *isl_vec_read_from_file(isl_ctx *ctx, FILE *input) { isl_vec *v; struct isl_stream *s = isl_stream_new_file(ctx, input); if (!s) return NULL; - v = vec_read(s, input_format); + v = vec_read(s); isl_stream_free(s); return v; } diff --git a/polyhedron_minimize.c b/polyhedron_minimize.c index 94fe7f51..f6c2dc95 100644 --- a/polyhedron_minimize.c +++ b/polyhedron_minimize.c @@ -67,7 +67,7 @@ int main(int argc, char **argv) isl_int_init(opt); bset = isl_basic_set_read_from_file(ctx, stdin, 0); assert(bset); - obj = isl_vec_read_from_file(ctx, stdin, ISL_FORMAT_POLYLIB); + obj = isl_vec_read_from_file(ctx, stdin); assert(obj); dim = isl_basic_set_total_dim(bset); assert(obj->size >= dim && obj->size <= dim + 1); -- 2.11.4.GIT