lkml.org 
[lkml]   [2011]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [PATCH 1/2] kconfig: Factor out conf_validate_choice_val() function from conf_read_simple()
    Date
    Hi,
    On Sat, Jul 30, 2011 at 7:13 PM, David Woodhouse <dwmw2@infradead.org> wrote:
    > We're going to want to do this from elsewhere, shortly...
    >
    > Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    >
    I would go a little further and apply the attached patch too, The two jump
    site to `setsym' do not meet the conditionnal and can be avoided.

    - Arnaud

    diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
    index 0341254..74dcfb1 100644
    --- a/scripts/kconfig/confdata.c
    +++ b/scripts/kconfig/confdata.c
    @@ -284,7 +284,7 @@ load:
    sym = sym_find(line + 2 + strlen(CONFIG_));
    if (!sym) {
    sym_add_change_count(1);
    - goto setsym;
    + continue;
    }
    } else {
    sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
    @@ -318,7 +318,7 @@ load:
    sym = sym_find(line + strlen(CONFIG_));
    if (!sym) {
    sym_add_change_count(1);
    - goto setsym;
    + continue;
    }
    } else {
    sym = sym_lookup(line + strlen(CONFIG_), 0);
    @@ -335,7 +335,7 @@ load:
    conf_warning("unexpected data");
    continue;
    }
    -setsym:
    if (sym && sym_is_choice_value(sym))
    conf_validate_choice_val(sym, def, def_flags);
    }

    \
     
     \ /
      Last update: 2011-07-31 04:23    [W:0.021 / U:59.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site