Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

kconfig: rename file_write_dep and move it to confdata.c 



file_write_dep() is called only from conf_write_autoconf().
Move it from util.c to confdata.c to make it static.
Also, rename it to conf_write_dep() since it should belong to
the group of conf_write* functions.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 08b220b3

scripts/kconfig/confdata.c

+30 −1
Original line number Diff line number Diff line
@@ -818,6 +818,35 @@ int conf_write(const char *name) 
	return 0;

}



/* write a dependency file as used by kbuild to track dependencies */

static int conf_write_dep(const char *name)

{

	struct file *file;

	FILE *out;



	if (!name)

		name = ".kconfig.d";

	out = fopen("..config.tmp", "w");

	if (!out)

		return 1;

	fprintf(out, "deps_config := \\\n");

	for (file = file_list; file; file = file->next) {

		if (file->next)

			fprintf(out, "\t%s \\\n", file->name);

		else

			fprintf(out, "\t%s\n", file->name);

	}

	fprintf(out, "\n%s: \\\n"

		     "\t$(deps_config)\n\n", conf_get_autoconfig_name());



	env_write_dep(out, conf_get_autoconfig_name());



	fprintf(out, "\n$(deps_config): ;\n");

	fclose(out);

	rename("..config.tmp", name);

	return 0;

}



static int conf_split_config(void)

{

	const char *name;
@@ -940,7 +969,7 @@ int conf_write_autoconf(void) 


	sym_clear_all_valid();



	file_write_dep("include/config/auto.conf.cmd");

	conf_write_dep("include/config/auto.conf.cmd");



	if (conf_split_config())

		return 1;

scripts/kconfig/lkc.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ void menu_set_type(int type); 


/* util.c */

struct file *file_lookup(const char *name);

int file_write_dep(const char *name);

void *xmalloc(size_t size);

void *xcalloc(size_t nmemb, size_t size);

void *xrealloc(void *p, size_t size);

scripts/kconfig/util.c

+0 −30
Original line number Diff line number Diff line
@@ -29,36 +29,6 @@ struct file *file_lookup(const char *name) 
	return file;

}



/* write a dependency file as used by kbuild to track dependencies */

int file_write_dep(const char *name)

{

	struct file *file;

	FILE *out;



	if (!name)

		name = ".kconfig.d";

	out = fopen("..config.tmp", "w");

	if (!out)

		return 1;

	fprintf(out, "deps_config := \\\n");

	for (file = file_list; file; file = file->next) {

		if (file->next)

			fprintf(out, "\t%s \\\n", file->name);

		else

			fprintf(out, "\t%s\n", file->name);

	}

	fprintf(out, "\n%s: \\\n"

		     "\t$(deps_config)\n\n", conf_get_autoconfig_name());



	env_write_dep(out, conf_get_autoconfig_name());



	fprintf(out, "\n$(deps_config): ;\n");

	fclose(out);

	rename("..config.tmp", name);

	return 0;

}





/* Allocate initial growable string */

struct gstr str_new(void)

{