Commit f034d186 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

genksyms: reduce the indentation in the for-loop in __add_symbol()



To improve readability, reduce the indentation as follows:

  - Use 'continue' earlier when the symbol does not match

  - flip !sym->is_declared to flatten the if-else chain

No functional changes are intended.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent be2fa44b
Loading
Loading
Loading
Loading
+30 −33
Original line number Diff line number Diff line
@@ -226,23 +226,26 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,

	h = crc32(name) % HASH_BUCKETS;
	for (sym = symtab[h]; sym; sym = sym->hash_next) {
		if (map_to_ns(sym->type) == map_to_ns(type) &&
		    strcmp(name, sym->name) == 0) {
			if (is_reference)
		if (map_to_ns(sym->type) != map_to_ns(type) ||
		    strcmp(name, sym->name))
			continue;

		if (is_reference) {
			/* fall through */ ;
			else if (sym->type == type &&
				 equal_list(sym->defn, defn)) {
		} else if (sym->type == type && equal_list(sym->defn, defn)) {
			if (!sym->is_declared && sym->is_override) {
				print_location();
				print_type_name(type, name);
					fprintf(stderr, " modversion is "
						"unchanged\n");
				fprintf(stderr, " modversion is unchanged\n");
			}
			sym->is_declared = 1;
			free_list(defn, NULL);
			return sym;
			} else if (!sym->is_declared) {
				if (sym->is_override && flag_preserve) {
		} else if (sym->is_declared) {
			error_with_pos("redefinition of %s", name);
			free_list(defn, NULL);
			return sym;
		} else if (sym->is_override && flag_preserve) {
			print_location();
			fprintf(stderr, "ignoring ");
			print_type_name(type, name);
@@ -254,14 +257,8 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
			status = is_unknown_symbol(sym) ?
					STATUS_DEFINED : STATUS_MODIFIED;
		}
			} else {
				error_with_pos("redefinition of %s", name);
				free_list(defn, NULL);
				return sym;
			}
		break;
	}
	}

	if (sym) {
		struct symbol **psym;