From 70d8f68ef5839ee23ea39425076e4d2047bf0db2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 12 Jun 2012 19:31:37 +0300 Subject: [PATCH] buf_size: move some functions around I think the db stuff should be available for get_array_size() not just get_array_size_bytes(). Signed-off-by: Dan Carpenter --- smatch_buf_size.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/smatch_buf_size.c b/smatch_buf_size.c index 2410ef20..577bd4f1 100644 --- a/smatch_buf_size.c +++ b/smatch_buf_size.c @@ -108,6 +108,30 @@ static float get_cast_ratio(struct expression *unstripped) return start_bytes / end_bytes; } +static int db_size; +static int db_size_callback(void *unused, int argc, char **argv, char **azColName) +{ + db_size = atoi(argv[0]); + return 0; +} + +static int size_from_db(struct expression *expr) +{ + char *name; + + if (!option_spammy) + return 0; + + name = get_member_name(expr); + if (!name) + return 0; + + db_size = 0; + run_sql(db_size_callback, "select size from type_size where type = '%s'", + name); + return db_size; +} + int get_array_size(struct expression *expr) { struct symbol *tmp; @@ -162,30 +186,6 @@ int get_array_size(struct expression *expr) return 0; } -static int db_size; -static int db_size_callback(void *unused, int argc, char **argv, char **azColName) -{ - db_size = atoi(argv[0]); - return 0; -} - -static int size_from_db(struct expression *expr) -{ - char *name; - - if (!option_spammy) - return 0; - - name = get_member_name(expr); - if (!name) - return 0; - - db_size = 0; - run_sql(db_size_callback, "select size from type_size where type = '%s'", - name); - return db_size; -} - int get_array_size_bytes(struct expression *expr) { struct symbol *tmp; -- 2.11.4.GIT