X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=attribute.c;h=215a8e6d602183767417a531a4037ff3eaf1cd0a;hb=127a634aa53da8c37ee50f365184cccad67df0d8;hp=651c6ee5d91a3015e5cab4f1964d5b87f28aba83;hpb=9237a87907d3057e6014f4d326f03b16baed108a;p=cparser

diff --git a/attribute.c b/attribute.c
index 651c6ee..215a8e6 100644
--- a/attribute.c
+++ b/attribute.c
@@ -166,23 +166,18 @@ type_t *handle_attribute_mode(const attribute_t *attribute, type_t *orig_type)
 	} else if (strcmp_underscore("DI", symbol_str) == 0) {
 		akind = sign ? ATOMIC_TYPE_LONGLONG : ATOMIC_TYPE_ULONGLONG;
 	} else {
-		if (warning.other)
-			warningf(&attribute->source_position, "ignoring unknown mode '%s'",
-			         symbol_str);
+		source_position_t const *const pos = &attribute->source_position;
+		warningf(WARN_OTHER, pos, "ignoring unknown mode '%s'", symbol_str);
 		return orig_type;
 	}
 
-	if (type->kind == TYPE_ATOMIC) {
+	if (type->kind == TYPE_ATOMIC || type->kind == TYPE_ENUM) {
 		type_t *copy       = duplicate_type(type);
 		copy->atomic.akind = akind;
 		return identify_new_type(copy);
-	} else if (type->kind == TYPE_ENUM) {
-		type_t *copy      = duplicate_type(type);
-		copy->enumt.akind = akind;
-		return identify_new_type(copy);
 	} else if (is_type_pointer(type)) {
-		warningf(&attribute->source_position,
-		         "__attribute__((mode)) on pointers not implemented yet (ignored)");
+		source_position_t const *const pos = &attribute->source_position;
+		warningf(WARN_OTHER, pos, "__attribute__((mode)) on pointers not implemented yet (ignored)");
 		return type;
 	}
 
@@ -227,19 +222,18 @@ static void handle_attribute_aligned(const attribute_t *attribute,
 		break;
 	case ENTITY_STRUCT:
 	case ENTITY_UNION:
-		if (alignment > entity->compound.alignment) {
+		if (alignment > (int)entity->compound.alignment) {
 			entity->compound.alignment = alignment;
 		}
 		break;
-	default:
-		if (warning.other) {
-			const char *what = get_entity_kind_name(entity->kind);
-			warningf(&attribute->source_position,
-					 "alignment attribute specification on %s '%S' ignored",
-					 what, entity->base.symbol);
-		}
+	default: {
+		source_position_t const *const pos  = &attribute->source_position;
+		char              const *const what = get_entity_kind_name(entity->kind);
+		symbol_t          const *const sym  = entity->base.symbol;
+		warningf(WARN_OTHER, pos, "alignment attribute specification on %s '%S' ignored", what, sym);
 		break;
 	}
+	}
 }
 
 static const char *get_argument_string(const attribute_argument_t *argument)
@@ -285,15 +279,14 @@ static void handle_attribute_visibility(const attribute_t *attribute,
 	case ENTITY_FUNCTION:
 		entity->function.elf_visibility = visibility;
 		break;
-	default:
-		if (warning.other) {
-			const char *what = get_entity_kind_name(entity->kind);
-			warningf(&attribute->source_position,
-					 "visibility attribute specification on %s '%S' ignored",
-					 what, entity->base.symbol);
-		}
+	default: {
+		source_position_t const *const pos  = &attribute->source_position;
+		char              const *const what = get_entity_kind_name(entity->kind);
+		symbol_t          const *const sym  = entity->base.symbol;
+		warningf(WARN_OTHER, pos, "visibility attribute specification on %s '%S' ignored", what, sym);
 		break;
 	}
+	}
 }
 
 static void warn_arguments(const attribute_t *attribute)
@@ -301,11 +294,9 @@ static void warn_arguments(const attribute_t *attribute)
 	if (attribute->a.arguments == NULL)
 		return;
 
-	if (warning.other) {
-		warningf(&attribute->source_position,
-				 "attribute '%s' needs no arguments",
-				 get_attribute_name(attribute->kind));
-	}
+	source_position_t const *const pos  = &attribute->source_position;
+	char              const *const what = get_attribute_name(attribute->kind);
+	warningf(WARN_OTHER, pos, "attribute '%s' needs no arguments", what);
 }
 
 static void handle_attribute_packed_e(const attribute_t *attribute,
@@ -313,10 +304,10 @@ static void handle_attribute_packed_e(const attribute_t *attribute,
 {
 #if 0
 	if (entity->kind != ENTITY_STRUCT) {
-		warningf(&attribute->source_position,
-		         "packed attribute on %s '%s' ignored",
-				 get_entity_kind_name(entity->kind),
-				 entity->base.symbol->string);
+		source_position_t const *const pos  = &attribute->source_position;
+		char              const *const what = get_entity_kind_name(entity->kind);
+		symbol_t          const *const sym  = entity->base.symbol;
+		warningf(WARN_OTHER, pos, "packed attribute on %s '%S' ignored", what, sym);
 		return;
 	}
 #endif
@@ -328,8 +319,8 @@ static void handle_attribute_packed_e(const attribute_t *attribute,
 static void handle_attribute_packed(const attribute_t *attribute, type_t *type)
 {
 	if (type->kind != TYPE_COMPOUND_STRUCT) {
-		warningf(&attribute->source_position,
-		         "packed attribute on type '%T' ignored", type);
+		source_position_t const *const pos  = &attribute->source_position;
+		warningf(WARN_OTHER, pos, "packed attribute on type '%T' ignored", type);
 		return;
 	}