X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=2a8f26928c3ec6bd79b6e80d3a4a938908085902;hb=442cc935f91c445283176287cd3c6fe536416bf7;hp=8469447352b3e7954986dc8cad6ead54023d91c4;hpb=bfd3963ada85c08264a068e2dcff1d90b7325e3e;p=cparser

diff --git a/parser.c b/parser.c
index 8469447..2a8f269 100644
--- a/parser.c
+++ b/parser.c
@@ -5095,7 +5095,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition)
 		type_t *const orig_type = decl->type;
 		assert(orig_type != NULL);
 		type_t *const type      = skip_typeref(orig_type);
-		type_t *      prev_type = skip_typeref(prev_decl->type);
+		type_t *const prev_type = skip_typeref(prev_decl->type);
 
 		if (!types_compatible(type, prev_type)) {
 			errorf(pos,
@@ -5114,20 +5114,14 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition)
 				         prev_decl->type, symbol);
 			}
 
-			unsigned new_storage_class = decl->storage_class;
-			if (is_type_incomplete(prev_type)) {
-				prev_decl->type = type;
-				prev_type       = type;
-			}
+			storage_class_tag_t new_storage_class = decl->storage_class;
 
 			/* pretend no storage class means extern for function
 			 * declarations (except if the previous declaration is neither
 			 * none nor extern) */
 			if (entity->kind == ENTITY_FUNCTION) {
-				if (prev_type->function.unspecified_parameters) {
+				if (prev_type->function.unspecified_parameters)
 					prev_decl->type = type;
-					prev_type       = type;
-				}
 
 				switch (old_storage_class) {
 				case STORAGE_CLASS_NONE:
@@ -5150,6 +5144,8 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition)
 				default:
 					break;
 				}
+			} else if (is_type_incomplete(prev_type)) {
+				prev_decl->type = type;
 			}
 
 			if (old_storage_class == STORAGE_CLASS_EXTERN &&
@@ -8872,7 +8868,8 @@ static void warn_div_by_zero(binary_expression_t const *const expression)
 /**
  * Check the semantic restrictions for a div/mod expression.
  */
-static void semantic_divmod_arithmetic(binary_expression_t *expression) {
+static void semantic_divmod_arithmetic(binary_expression_t *expression)
+{
 	semantic_binexpr_arithmetic(expression);
 	warn_div_by_zero(expression);
 }
@@ -10077,7 +10074,8 @@ end_error:
  *
  * @param statement  the switch statement to check
  */
-static void check_enum_cases(const switch_statement_t *statement) {
+static void check_enum_cases(const switch_statement_t *statement)
+{
 	const type_t *type = skip_typeref(statement->expression->base.type);
 	if (! is_type_enum(type))
 		return;