From 3499705162fcc59ce907146420b4c9e2327e0d55 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 19 Sep 2012 17:17:35 +0300 Subject: [PATCH] misc: whitespace cleanups Signed-off-by: Dan Carpenter --- check_format_string.c | 5 ++--- check_get_user_overflow.c | 2 +- check_kmalloc_wrong_size.c | 1 - check_return_efault.c | 1 - check_rosenberg.c | 1 - check_signed.c | 1 - check_user_data.c | 1 - smatch_constraints.c | 1 - smatch_db.c | 1 - smatch_estate.c | 1 - smatch_expressions.c | 1 - smatch_extra.c | 1 - smatch_math.c | 1 - smatch_ranges.c | 2 -- smatch_tracker.c | 1 - 15 files changed, 3 insertions(+), 18 deletions(-) diff --git a/check_format_string.c b/check_format_string.c index 5fb37ec5..17783c2f 100644 --- a/check_format_string.c +++ b/check_format_string.c @@ -7,11 +7,10 @@ static int my_id; static void match_printf(const char *fn, struct expression *expr, void *unused) { struct expression *format; - + format = get_argument_from_call_expr(expr->args, 0); - if (format -> type != EXPR_STRING) + if (format -> type != EXPR_STRING) sm_msg("warn: format strings should be constant to avoid format string vulnerabilities"); - } void check_format_string(int id) diff --git a/check_get_user_overflow.c b/check_get_user_overflow.c index beb4eded..86528730 100644 --- a/check_get_user_overflow.c +++ b/check_get_user_overflow.c @@ -129,7 +129,7 @@ static void check_expr(struct expression *expr) return; name = get_variable_from_expr(expr, NULL); - if (overflow && underflow) + if (overflow && underflow) sm_msg("warn: check for integer over/underflow '%s'", name); else if (underflow) sm_msg("warn: check for integer underflow '%s'", name); diff --git a/check_kmalloc_wrong_size.c b/check_kmalloc_wrong_size.c index d8666fa0..1f7c6b29 100644 --- a/check_kmalloc_wrong_size.c +++ b/check_kmalloc_wrong_size.c @@ -88,5 +88,4 @@ void check_kmalloc_wrong_size(int id) add_function_assign_hook("kmalloc", &match_alloc, NULL); add_function_assign_hook("kcalloc", &match_calloc, INT_PTR(1)); - } diff --git a/check_return_efault.c b/check_return_efault.c index 382080aa..ea257e84 100644 --- a/check_return_efault.c +++ b/check_return_efault.c @@ -44,7 +44,6 @@ static void match_copy(const char *fn, struct expression *expr, void *unused) if (!get_absolute_max(arg, &max)) max = whole_range.max; set_extra_expr_mod(expr->left, alloc_estate_range(0, max)); - } static void match_condition(struct expression *expr) diff --git a/check_rosenberg.c b/check_rosenberg.c index 3ba76b2a..ab91a6f6 100644 --- a/check_rosenberg.c +++ b/check_rosenberg.c @@ -133,7 +133,6 @@ static void check_members_initialized(struct expression *expr) struct symbol *outer; struct symbol *sym; struct symbol *tmp; - sym = get_type(expr); if (!sym || sym->type != SYM_STRUCT) diff --git a/check_signed.c b/check_signed.c index ed989f39..f3e33efa 100644 --- a/check_signed.c +++ b/check_signed.c @@ -94,7 +94,6 @@ static void match_assign(struct expression *expr) sm_msg("warn: value %lld can't fit into %lld '%s'", val, min, name); free_string(name); } - } static const char *get_tf(long long variable, long long known, int var_pos, int op) diff --git a/check_user_data.c b/check_user_data.c index 4152708e..b722fd55 100644 --- a/check_user_data.c +++ b/check_user_data.c @@ -235,7 +235,6 @@ static void match_condition(struct expression *expr) default: return; } - } static void match_normal_assign(struct expression *expr) diff --git a/smatch_constraints.c b/smatch_constraints.c index 54ce9ab4..0ed68224 100644 --- a/smatch_constraints.c +++ b/smatch_constraints.c @@ -84,7 +84,6 @@ static int cmp_relation(struct relation *a, struct relation *b) return ret; return 0; - } struct related_list *get_shared_relations(struct related_list *one, diff --git a/smatch_db.c b/smatch_db.c index 780752d6..12a1daec 100644 --- a/smatch_db.c +++ b/smatch_db.c @@ -445,7 +445,6 @@ static void print_initializer_list(struct expression_list *expr_list, expr->expr_ident->name, expr->ident_expression->symbol_name->name); } END_FOR_EACH_PTR(expr); - } static void global_variable(struct symbol *sym) diff --git a/smatch_estate.c b/smatch_estate.c index 6df31b81..d31d22d3 100644 --- a/smatch_estate.c +++ b/smatch_estate.c @@ -31,7 +31,6 @@ struct data_info *get_dinfo(struct smatch_state *state) if (!state) return NULL; return (struct data_info *)state->data; - } struct range_list *estate_ranges(struct smatch_state *state) diff --git a/smatch_expressions.c b/smatch_expressions.c index af81ed08..a5de4b88 100644 --- a/smatch_expressions.c +++ b/smatch_expressions.c @@ -56,5 +56,4 @@ struct expression *symbol_expression(struct symbol *sym) expr->symbol = sym; expr->symbol_name = sym->ident; return expr; - } diff --git a/smatch_extra.c b/smatch_extra.c index ccf3be58..3fbdb7ef 100644 --- a/smatch_extra.c +++ b/smatch_extra.c @@ -968,5 +968,4 @@ void register_smatch_extra_late(int id) add_hook(&match_function_call, FUNCTION_CALL_HOOK); add_hook(&match_assign, ASSIGNMENT_HOOK); add_hook(&match_call_assign, CALL_ASSIGNMENT_HOOK); - } diff --git a/smatch_math.c b/smatch_math.c index b46bcce5..8afbddbf 100644 --- a/smatch_math.c +++ b/smatch_math.c @@ -98,7 +98,6 @@ static long long handle_ampersand(int *undefined, int implied) *undefined = 1; return BOGUS; - } static long long handle_preop(struct expression *expr, int *undefined, int implied) diff --git a/smatch_ranges.c b/smatch_ranges.c index 089346b3..81eae58f 100644 --- a/smatch_ranges.c +++ b/smatch_ranges.c @@ -114,7 +114,6 @@ void get_value_ranges(char *value, struct range_list **rl) c++; c++; /* skip the comma in eg: 4-5,7 */ } - } static struct data_range range_zero = { @@ -641,7 +640,6 @@ int in_list_exact(struct range_list *list, struct data_range *drange) return 1; } END_FOR_EACH_PTR(tmp); return 0; - } void push_range_list(struct range_list_stack **rl_stack, struct range_list *rl) diff --git a/smatch_tracker.c b/smatch_tracker.c index 40eb83cf..04429822 100644 --- a/smatch_tracker.c +++ b/smatch_tracker.c @@ -50,7 +50,6 @@ static void free_tracker(struct tracker *t) { free_string(t->name); __free_tracker(t); - } void del_tracker(struct tracker_list **list, int owner, const char *name, -- 2.11.4.GIT