From patchwork Wed Jul 8 00:12:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 29569 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id EA6A6B7079 for ; Wed, 8 Jul 2009 10:24:40 +1000 (EST) Received: by ozlabs.org (Postfix) id 65F3BDF0DE; Wed, 8 Jul 2009 10:21:23 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 63ED6DE7C9 for ; Wed, 8 Jul 2009 10:21:23 +1000 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B79B0DDF8F; Wed, 8 Jul 2009 10:18:29 +1000 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX189jZ7ywxK/MnEEPh2UC+vpLxTBgzgZHS8@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n680INAj026815 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 8 Jul 2009 00:18:23 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n680INIm026814; Wed, 8 Jul 2009 00:18:23 GMT Message-Id: <20090708001136.698766969@am.sony.com> User-Agent: quilt/0.47-1 Date: Tue, 07 Jul 2009 17:12:00 -0700 From: Geoff Levand To: Jeremy Kerr In-Reply-To: <20090708001134.934244536@am.sony.com> References: <20090708001134.934244536@am.sony.com> Content-Disposition: inline; filename=parser-zero-globals.diff X-Virus-Scanned: ClamAV 0.93.3/9541/Tue Jul 7 17:31:53 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 08 Jul 2009 00:18:24 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 26/31] petitboot: Zero parser globals before use X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Signed-off-by: Geoff Levand --- discover/kboot-parser.c | 1 + discover/parser-conf.c | 19 +++++++++++++++++-- discover/parser-conf.h | 1 + discover/yaboot-parser.c | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -137,6 +137,7 @@ static int kboot_parse(struct discover_c conf->dc = dc; conf->global_options = kboot_global_options, + conf_init_global_options(conf); conf->conf_files = kboot_conf_files, conf->process_pair = kboot_process_pair; conf->parser_info = (void *)kboot_ignored_names, --- a/discover/parser-conf.c +++ b/discover/parser-conf.c @@ -121,6 +121,18 @@ int conf_param_in_list(const char *const } /** + * conf_init_global_options - Zero the global option table. + */ + +void conf_init_global_options(struct conf_context *conf) +{ + int i; + + for (i = 0; conf->global_options[i].name; i++) + conf->global_options[i].value = NULL; +} + +/** * conf_set_global_option - Set a value in the global option table. * * Check if an option (name=value) is a global option. If so, store it in @@ -136,7 +148,7 @@ int conf_set_global_option(struct conf_c if (streq(name, conf->global_options[i].name)) { conf->global_options[i].value = talloc_strdup(conf, value); - pb_log("%s: %s:%s\n", __func__, name, value); + pb_log("%s: @%s@%s@\n", __func__, name, value); return 1; } } @@ -158,8 +170,11 @@ const char *conf_get_global_option(struc int i; for (i = 0; conf->global_options[i].name ;i++) - if (streq(name, conf->global_options[i].name)) + if (streq(name, conf->global_options[i].name)) { + pb_log("%s: @%s@%s@\n", __func__, name, + conf->global_options[i].value); return conf->global_options[i].value; + } assert(0 && "unknown global name"); return NULL; --- a/discover/parser-conf.h +++ b/discover/parser-conf.h @@ -41,6 +41,7 @@ struct conf_context { int conf_parse(struct conf_context *conf); char *conf_get_param_pair(char *str, char **name_out, char **value_out, char terminator); +void conf_init_global_options(struct conf_context *conf); const char *conf_get_global_option(struct conf_context *conf, const char *name); int conf_set_global_option(struct conf_context *conf, const char *name, --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -240,6 +240,7 @@ static int yaboot_parse(struct discover_ conf->dc = dc; conf->global_options = yaboot_global_options, + conf_init_global_options(conf); conf->conf_files = yaboot_conf_files, conf->process_pair = yaboot_process_pair; conf->finish = yaboot_finish;