X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=a191992127f95a720e06f0e8d8f2db1c457a7df4;hb=cf80e941ca33006ab52321c2c74c6c30a7a4d10a;hp=80fadccaf5f2275fff02085c75f5cdba8391cc8c;hpb=ac8825ce886206a4d8b44e74c55b206328da3422;p=cparser

diff --git a/ast.c b/ast.c
index 80fadcc..a191992 100644
--- a/ast.c
+++ b/ast.c
@@ -1268,7 +1268,7 @@ static void print_ms_modifiers(const declaration_t *declaration) {
 	if((c_mode & _MS) == 0)
 		return;
 
-	decl_modifiers_t modifiers = declaration->decl_modifiers;
+	decl_modifiers_t modifiers = declaration->modifiers;
 
 	/* DM_FORCEINLINE handled outside. */
 	if((modifiers & ~DM_FORCEINLINE) != 0 ||
@@ -1342,10 +1342,10 @@ static void print_normal_declaration(const declaration_t *declaration)
 {
 	print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
 	if(declaration->is_inline) {
-		if(declaration->decl_modifiers & DM_FORCEINLINE)
+		if(declaration->modifiers & DM_FORCEINLINE)
 			fputs("__forceinline ", out);
 		else {
-			if(declaration->decl_modifiers & DM_MICROSOFT_INLINE)
+			if(declaration->modifiers & DM_MICROSOFT_INLINE)
 				fputs("__inline ", out);
 			else
 				fputs("inline ", out);
@@ -1504,13 +1504,14 @@ bool is_address_constant(const expression_t *expression)
 		return is_object_with_linker_constant_address(expression->unary.value);
 
 	case EXPR_UNARY_DEREFERENCE: {
-		type_t *real_type = revert_automatic_type_conversion(expression->unary.value);
+		type_t *real_type
+			= revert_automatic_type_conversion(expression->unary.value);
 		/* dereferencing a function is a NOP */
 		if(is_type_function(real_type)) {
 			return is_address_constant(expression->unary.value);
 		}
 
-		return false;
+		/* fallthrough */
 	}
 
 	case EXPR_UNARY_CAST: