confdata.c (058250a0d5886b4d96a195ecc7e3a75e2df5e4b1) | confdata.c (d84876f9f8042d5536050b83674c4f348ca3c4df) |
---|---|
1/* 2 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> 3 * Released under the terms of the GNU GPL v2.0. 4 */ 5 6#include <sys/stat.h> 7#include <ctype.h> 8#include <fcntl.h> --- 218 unchanged lines hidden (view full) --- 227 break; 228 } 229 } else { 230 sym = sym_lookup(line + 9, 0); 231 if (sym->type == S_UNKNOWN) 232 sym->type = S_BOOLEAN; 233 } 234 if (sym->flags & def_flags) { | 1/* 2 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> 3 * Released under the terms of the GNU GPL v2.0. 4 */ 5 6#include <sys/stat.h> 7#include <ctype.h> 8#include <fcntl.h> --- 218 unchanged lines hidden (view full) --- 227 break; 228 } 229 } else { 230 sym = sym_lookup(line + 9, 0); 231 if (sym->type == S_UNKNOWN) 232 sym->type = S_BOOLEAN; 233 } 234 if (sym->flags & def_flags) { |
235 conf_warning("trying to reassign symbol %s", sym->name); 236 break; | 235 conf_warning("override: reassigning to symbol %s", sym->name); |
237 } 238 switch (sym->type) { 239 case S_BOOLEAN: 240 case S_TRISTATE: 241 sym->def[def].tri = no; 242 sym->flags |= def_flags; 243 break; 244 default: --- 22 unchanged lines hidden (view full) --- 267 break; 268 } 269 } else { 270 sym = sym_lookup(line + 7, 0); 271 if (sym->type == S_UNKNOWN) 272 sym->type = S_OTHER; 273 } 274 if (sym->flags & def_flags) { | 236 } 237 switch (sym->type) { 238 case S_BOOLEAN: 239 case S_TRISTATE: 240 sym->def[def].tri = no; 241 sym->flags |= def_flags; 242 break; 243 default: --- 22 unchanged lines hidden (view full) --- 266 break; 267 } 268 } else { 269 sym = sym_lookup(line + 7, 0); 270 if (sym->type == S_UNKNOWN) 271 sym->type = S_OTHER; 272 } 273 if (sym->flags & def_flags) { |
275 conf_warning("trying to reassign symbol %s", sym->name); 276 break; | 274 conf_warning("override: reassigning to symbol %s", sym->name); |
277 } 278 if (conf_set_sym_val(sym, def, def_flags, p)) 279 continue; 280 break; 281 case '\r': 282 case '\n': 283 break; 284 default: --- 7 unchanged lines hidden (view full) --- 292 break; 293 case mod: 294 if (cs->def[def].tri == yes) { 295 conf_warning("%s creates inconsistent choice state", sym->name); 296 cs->flags &= ~def_flags; 297 } 298 break; 299 case yes: | 275 } 276 if (conf_set_sym_val(sym, def, def_flags, p)) 277 continue; 278 break; 279 case '\r': 280 case '\n': 281 break; 282 default: --- 7 unchanged lines hidden (view full) --- 290 break; 291 case mod: 292 if (cs->def[def].tri == yes) { 293 conf_warning("%s creates inconsistent choice state", sym->name); 294 cs->flags &= ~def_flags; 295 } 296 break; 297 case yes: |
300 if (cs->def[def].tri != no) { 301 conf_warning("%s creates inconsistent choice state", sym->name); 302 cs->flags &= ~def_flags; 303 } else 304 cs->def[def].val = sym; | 298 if (cs->def[def].tri != no) 299 conf_warning("override: %s changes choice state", sym->name); 300 cs->def[def].val = sym; |
305 break; 306 } 307 cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri); 308 } 309 } 310 fclose(in); 311 312 if (modules_sym) --- 506 unchanged lines hidden --- | 301 break; 302 } 303 cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri); 304 } 305 } 306 fclose(in); 307 308 if (modules_sym) --- 506 unchanged lines hidden --- |