Changeset 26535
- Timestamp:
- 2011-04-08T20:55:16+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/backfire/scripts/kconfig.pl
r19366 r26535 81 81 } 82 82 83 sub config_diff($$ ) {83 sub config_diff($$$) { 84 84 my $cfg1 = shift; 85 85 my $cfg2 = shift; 86 my $new_only = shift; 86 87 my %config; 87 88 88 89 foreach my $config (keys %$cfg2) { 89 90 if (!defined($cfg1->{$config}) or $cfg1->{$config} ne $cfg2->{$config}) { 91 next if $new_only and !defined($cfg1->{$config}) and $cfg2->{$config} eq '#undef'; 90 92 $config{$config} = $cfg2->{$config}; 91 93 } … … 147 149 my $arg1 = parse_expr($pos); 148 150 my $arg2 = parse_expr($pos); 149 return config_diff($arg1, $arg2); 151 return config_diff($arg1, $arg2, 0); 152 } elsif ($arg eq '>+') { 153 my $arg1 = parse_expr($pos); 154 my $arg2 = parse_expr($pos); 155 return config_diff($arg1, $arg2, 1); 150 156 } elsif ($arg eq '-') { 151 157 my $arg1 = parse_expr($pos);
Note: See TracChangeset
for help on using the changeset viewer.