From b5bc2ba49c71e8df784a9c904aebaa545d38fcf2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 5 Nov 2012 18:36:14 +0300 Subject: [PATCH] sval: delete a bunch of "long long" functions All these have been updated to use sval_t instead long long. Signed-off-by: Dan Carpenter --- smatch.h | 7 ------ smatch_math.c | 71 ----------------------------------------------------------- 2 files changed, 78 deletions(-) diff --git a/smatch.h b/smatch.h index 8910dd1b..f8fc067c 100644 --- a/smatch.h +++ b/smatch.h @@ -223,13 +223,6 @@ char *get_variable_from_expr_complex(struct expression *expr, char *get_variable_from_expr(struct expression *expr, struct symbol **sym_ptr); int sym_name_is(const char *name, struct expression *expr); -int get_value(struct expression *expr, long long *val); -int get_implied_value(struct expression *expr, long long *val); -int get_implied_max(struct expression *expr, long long *val); -int get_implied_min(struct expression *expr, long long *val); -int get_fuzzy_min(struct expression *expr, long long *min); -int get_fuzzy_max(struct expression *expr, long long *max); -int get_absolute_min(struct expression *expr, long long *val); int get_value_sval(struct expression *expr, sval_t *val); int get_implied_value_sval(struct expression *expr, sval_t *val); int get_implied_max_sval(struct expression *expr, sval_t *val); diff --git a/smatch_math.c b/smatch_math.c index f4596be3..d1df09f5 100644 --- a/smatch_math.c +++ b/smatch_math.c @@ -561,18 +561,6 @@ static sval_t _get_value(struct expression *expr, int *undefined, int implied) } /* returns 1 if it can get a value literal or else returns 0 */ -int get_value(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, NOTIMPLIED); - if (undefined) - return 0; - *val = tmp_ret.value; - return 1; -} - int get_value_sval(struct expression *expr, sval_t *val) { int undefined = 0; @@ -583,16 +571,6 @@ int get_value_sval(struct expression *expr, sval_t *val) return 1; } -int get_implied_value(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, IMPLIED); - *val = tmp_ret.value; - return !undefined; -} - int get_implied_value_sval(struct expression *expr, sval_t *sval) { int undefined = 0; @@ -601,16 +579,6 @@ int get_implied_value_sval(struct expression *expr, sval_t *sval) return !undefined; } -int get_implied_min(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, IMPLIED_MIN); - *val = tmp_ret.value; - return !undefined; -} - int get_implied_min_sval(struct expression *expr, sval_t *sval) { int undefined = 0; @@ -619,16 +587,6 @@ int get_implied_min_sval(struct expression *expr, sval_t *sval) return !undefined; } -int get_implied_max(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, IMPLIED_MAX); - *val = tmp_ret.value; - return !undefined; -} - int get_implied_max_sval(struct expression *expr, sval_t *sval) { int undefined = 0; @@ -637,16 +595,6 @@ int get_implied_max_sval(struct expression *expr, sval_t *sval) return !undefined; } -int get_fuzzy_min(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, FUZZYMIN); - *val = tmp_ret.value; - return !undefined; -} - int get_fuzzy_min_sval(struct expression *expr, sval_t *sval) { int undefined = 0; @@ -655,16 +603,6 @@ int get_fuzzy_min_sval(struct expression *expr, sval_t *sval) return !undefined; } -int get_fuzzy_max(struct expression *expr, long long *val) -{ - int undefined = 0; - sval_t tmp_ret; - - tmp_ret = _get_value(expr, &undefined, FUZZYMAX); - *val = tmp_ret.value; - return !undefined; -} - int get_fuzzy_max_sval(struct expression *expr, sval_t *sval) { int undefined = 0; @@ -673,15 +611,6 @@ int get_fuzzy_max_sval(struct expression *expr, sval_t *sval) return !undefined; } -int get_absolute_min(struct expression *expr, long long *val) -{ - sval_t tmp_ret; - - get_absolute_min_sval(expr, &tmp_ret); - *val = tmp_ret.value; - return 1; -} - int get_absolute_min_sval(struct expression *expr, sval_t *sval) { int undefined = 0; -- 2.11.4.GIT