Commit cb80514d authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: use warn()/fatal() consistent in modpost 



modpost.c provides warn() and fatal() - so use them all over the place.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 06300b21

scripts/mod/file2alias.c

+6 −7
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void do_usb_table(void *symval, unsigned long size, 
	const unsigned long id_size = sizeof(struct usb_device_id);



	if (size % id_size || size < id_size) {

		fprintf(stderr, "*** Warning: %s ids %lu bad size "

		warn("%s ids %lu bad size "

		     "(each on %lu)\n", mod->name, size, id_size);

	}

	/* Leave last one: it's the terminator. */
@@ -217,8 +217,7 @@ static int do_pci_entry(const char *filename, 
	if ((baseclass_mask != 0 && baseclass_mask != 0xFF)

	    || (subclass_mask != 0 && subclass_mask != 0xFF)

	    || (interface_mask != 0 && interface_mask != 0xFF)) {

		fprintf(stderr,

			"*** Warning: Can't handle masks in %s:%04X\n",

		warn("Can't handle masks in %s:%04X\n",

		     filename, id->class_mask);

		return 0;

	}
@@ -445,7 +444,7 @@ static void do_table(void *symval, unsigned long size, 
	int (*do_entry)(const char *, void *entry, char *alias) = function;



	if (size % id_size || size < id_size) {

		fprintf(stderr, "*** Warning: %s ids %lu bad size "

		warn("%s ids %lu bad size "

		     "(each on %lu)\n", mod->name, size, id_size);

	}

	/* Leave last one: it's the terminator. */

scripts/mod/modpost.c

+6 −10
Original line number Diff line number Diff line
@@ -303,8 +303,7 @@ parse_elf(struct elf_info *info, const char *filename) 
			             sechdrs[sechdrs[i].sh_link].sh_offset;

	}

	if (!info->symtab_start) {

		fprintf(stderr, "modpost: %s no symtab?\n", filename);

		abort();

		fatal("%s has no symtab?\n", filename);

	}

	/* Fix endianness in symbols */

	for (sym = info->symtab_start; sym < info->symtab_stop; sym++) {
@@ -316,8 +315,7 @@ parse_elf(struct elf_info *info, const char *filename) 
	return;



 truncated:

	fprintf(stderr, "modpost: %s is truncated.\n", filename);

	abort();

	fatal("%s is truncated.\n", filename);

}



void
@@ -337,8 +335,7 @@ handle_modversions(struct module *mod, struct elf_info *info, 


	switch (sym->st_shndx) {

	case SHN_COMMON:

		fprintf(stderr, "*** Warning: \"%s\" [%s] is COMMON symbol\n",

			symname, mod->name);

		warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);

		break;

	case SHN_ABS:

		/* CRC'd symbol */
@@ -562,8 +559,8 @@ add_versions(struct buffer *b, struct module *mod) 
		exp = find_symbol(s->name);

		if (!exp || exp->module == mod) {

			if (have_vmlinux && !s->weak)

				fprintf(stderr, "*** Warning: \"%s\" [%s.ko] "

				"undefined!\n",	s->name, mod->name);

				warn("\"%s\" [%s.ko] undefined!\n",

				     s->name, mod->name);

			continue;

		}

		s->module = exp->module;
@@ -584,8 +581,7 @@ add_versions(struct buffer *b, struct module *mod) 
			continue;

		}

		if (!s->crc_valid) {

			fprintf(stderr, "*** Warning: \"%s\" [%s.ko] "

				"has no CRC!\n",

			warn("\"%s\" [%s.ko] has no CRC!\n",

				s->name, mod->name);

			continue;

		}

scripts/mod/modpost.h

+6 −1
Original line number Diff line number Diff line
@@ -91,17 +91,22 @@ struct elf_info { 
	unsigned int modinfo_len;

};



/* file2alias.c */

void handle_moddevtable(struct module *mod, struct elf_info *info,

			Elf_Sym *sym, const char *symname);



void add_moddevtable(struct buffer *buf, struct module *mod);



/* sumversion.c */

void maybe_frob_rcs_version(const char *modfilename,

			    char *version,

			    void *modinfo,

			    unsigned long modinfo_offset);

void get_src_version(const char *modname, char sum[], unsigned sumlen);



/* from modpost.c */

void *grab_file(const char *filename, unsigned long *size);

char* get_next_line(unsigned long *pos, void *file, unsigned long size);

void release_file(void *file, unsigned long size);



void fatal(const char *fmt, ...);

void warn(const char *fmt, ...);

scripts/mod/sumversion.c

+9 −14
Original line number Diff line number Diff line
@@ -316,8 +316,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) 


	file = grab_file(cmd, &flen);

	if (!file) {

		fprintf(stderr, "Warning: could not find %s for %s\n",

			cmd, objfile);

		warn("could not find %s for %s\n", cmd, objfile);

		goto out;

	}
@@ -355,8 +354,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) 
		/* Check if this file is in same dir as objfile */

		if ((strstr(line, dir)+strlen(dir)-1) == strrchr(line, '/')) {

			if (!parse_file(line, md)) {

				fprintf(stderr,

					"Warning: could not open %s: %s\n",

				warn("could not open %s: %s\n",

				     line, strerror(errno));

				goto out_file;

			}
@@ -397,23 +395,20 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) 


	file = grab_file(filelist, &len);

	if (!file) {

		fprintf(stderr, "Warning: could not find versions for %s\n",

			filelist);

		warn("could not find versions for %s\n", filelist);

		return;

	}



	sources = strchr(file, '\n');

	if (!sources) {

		fprintf(stderr, "Warning: malformed versions file for %s\n",

			modname);

		warn("malformed versions file for %s\n", modname);

		goto release;

	}



	sources++;

	end = strchr(sources, '\n');

	if (!end) {

		fprintf(stderr, "Warning: bad ending versions file for %s\n",

			modname);

		warn("bad ending versions file for %s\n", modname);

		goto release;

	}

	*end = '\0';
@@ -438,19 +433,19 @@ static void write_version(const char *filename, const char *sum, 


	fd = open(filename, O_RDWR);

	if (fd < 0) {

		fprintf(stderr, "Warning: changing sum in %s failed: %s\n",

		warn("changing sum in %s failed: %s\n",

			filename, strerror(errno));

		return;

	}



	if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {

		fprintf(stderr, "Warning: changing sum in %s:%lu failed: %s\n",

		warn("changing sum in %s:%lu failed: %s\n",

			filename, offset, strerror(errno));

		goto out;

	}



	if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {

		fprintf(stderr, "Warning: writing sum in %s failed: %s\n",

		warn("writing sum in %s failed: %s\n",

			filename, strerror(errno));

		goto out;

	}