projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: Print reverse dependencies in groups
[carl9170fw.git]
/
config
/
confdata.c
diff --git
a/config/confdata.c
b/config/confdata.c
index 5e585c4626e1e3399502d2fae0a98e732ee58733..21efc143abf386c2a4525a9a001b9b42a7b07bf8 100644
(file)
--- a/
config/confdata.c
+++ b/
config/confdata.c
@@
-28,7
+28,7
@@
static void conf_message(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2)));
static const char *conf_filename;
__attribute__ ((format (printf, 1, 2)));
static const char *conf_filename;
-static int conf_lineno, conf_warnings
, conf_unsaved
;
+static int conf_lineno, conf_warnings;
const char conf_defname[] = "include/generated/defconfig";
const char conf_defname[] = "include/generated/defconfig";
@@
-178,7
+178,7
@@
static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
case S_HEX:
done:
if (sym_string_valid(sym, p)) {
case S_HEX:
done:
if (sym_string_valid(sym, p)) {
- sym->def[def].val = strdup(p);
+ sym->def[def].val =
x
strdup(p);
sym->flags |= def_flags;
} else {
if (def != S_DEF_AUTO)
sym->flags |= def_flags;
} else {
if (def != S_DEF_AUTO)
@@
-201,7
+201,7
@@
static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
if (new_size > *n) {
new_size += LINE_GROWTH - 1;
new_size *= 2;
if (new_size > *n) {
new_size += LINE_GROWTH - 1;
new_size *= 2;
- nline = realloc(*lineptr, new_size);
+ nline =
x
realloc(*lineptr, new_size);
if (!nline)
return -1;
if (!nline)
return -1;
@@
-290,7
+290,6
@@
load:
conf_filename = name;
conf_lineno = 0;
conf_warnings = 0;
conf_filename = name;
conf_lineno = 0;
conf_warnings = 0;
- conf_unsaved = 0;
def_flags = SYMBOL_DEF << def;
for_all_symbols(i, sym) {
def_flags = SYMBOL_DEF << def;
for_all_symbols(i, sym) {
@@
-375,7
+374,9
@@
load:
continue;
} else {
if (line[0] != '\r' && line[0] != '\n')
continue;
} else {
if (line[0] != '\r' && line[0] != '\n')
- conf_warning("unexpected data");
+ conf_warning("unexpected data: %.*s",
+ (int)strcspn(line, "\r\n"), line);
+
continue;
}
setsym:
continue;
}
setsym:
@@
-407,6
+408,7
@@
setsym:
int conf_read(const char *name)
{
struct symbol *sym;
int conf_read(const char *name)
{
struct symbol *sym;
+ int conf_unsaved = 0;
int i;
sym_set_change_count(0);
int i;
sym_set_change_count(0);
@@
-1184,7
+1186,7
@@
void set_all_choice_values(struct symbol *csym)
bool conf_set_all_new_symbols(enum conf_def_mode mode)
{
struct symbol *sym, *csym;
bool conf_set_all_new_symbols(enum conf_def_mode mode)
{
struct symbol *sym, *csym;
- int i, cnt, pby, pty, ptm; /* pby: probability of bool
ean
= y
+ int i, cnt, pby, pty, ptm; /* pby: probability of bool
= y
* pty: probability of tristate = y
* ptm: probability of tristate = m
*/
* pty: probability of tristate = y
* ptm: probability of tristate = m
*/