From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Oz5Mx-0001HH-0g for mharc-grub-devel@gnu.org; Fri, 24 Sep 2010 06:19:07 -0400 Received: from [140.186.70.92] (port=39752 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oz5Mt-0001Gy-AN for grub-devel@gnu.org; Fri, 24 Sep 2010 06:19:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oz5Ms-0002O7-0l for grub-devel@gnu.org; Fri, 24 Sep 2010 06:19:03 -0400 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]:42120) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oz5Mr-0002Nl-OQ for grub-devel@gnu.org; Fri, 24 Sep 2010 06:19:01 -0400 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost03.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1Oz5Mq-00008c-5D for grub-devel@gnu.org; Fri, 24 Sep 2010 10:19:00 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1Oz5Mp-0003IX-00; Fri, 24 Sep 2010 11:18:59 +0100 Date: Fri, 24 Sep 2010 11:18:58 +0100 From: Colin Watson To: grub-devel@gnu.org Message-ID: <20100924101858.GG21862@riva.ucam.org> References: <4C9B3BD0.3060108@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4C9B3BD0.3060108@gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost03-IP: [82.69.40.219] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: [PATCH] Fix getline name clash X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2010 10:19:04 -0000 On Thu, Sep 23, 2010 at 01:36:48PM +0200, Grégoire Sutre wrote: > The attached patch simply renames this field by `getnewline'. This looks good to me as far as it goes, but doesn't it need a bit more? grub-core/commands/legacycfg.c:44: auto grub_err_t getline (char **line, int cont); grub-core/commands/legacycfg.c:45: grub_err_t getline (char **line, grub-core/commands/legacycfg.c:130: grub_normal_parse_line (parsed, getline); grub-core/commands/legacycfg.c:175: grub_normal_parse_line (suffix, getline); grub-core/kern/rescue_parser.c:28:grub_rescue_parse_line (char *line, grub_reader_getline_t getline) grub-core/kern/rescue_parser.c:35: if (grub_parser_split_cmdline (line, getline, &n, &args) || n < 0) grub-core/kern/parser.c:98:grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline, grub-core/kern/parser.c:149: if (getline) grub-core/kern/parser.c:150: getline (&rd, 1); grub-core/kern/parser.c:236: auto grub_err_t getline (char **line, int cont); grub-core/kern/parser.c:237: grub_err_t getline (char **line, int cont __attribute__ ((unused))) grub-core/kern/parser.c:261: getline (&line, 0); grub-core/kern/parser.c:262: grub_rescue_parse_line (line, getline); grub-core/kern/emu/getroot.c:118: while (getline (&buf, &len, fp) > 0) grub-core/kern/emu/getroot.c:655: while (getline (&buf, &len, mdadm) > 0) grub-core/normal/main.c:149: auto grub_err_t getline (char **line, int cont); grub-core/normal/main.c:150: grub_err_t getline (char **line, int cont __attribute__ ((unused))) grub-core/normal/main.c:194: if ((getline (&line, 0)) || (! line)) grub-core/normal/main.c:197: grub_normal_parse_line (line, getline); grub-core/script/lexer.c:138: if (! lexerstate->getline && ! input) grub-core/script/lexer.c:146: lexerstate->getline (&line, 1); grub-core/script/lexer.c:208: grub_reader_getline_t getline) grub-core/script/lexer.c:224: lexerstate->getline = getline; /* rest are all zeros already */ grub-core/script/execute.c:493: auto grub_err_t getline (char **line, int cont); grub-core/script/execute.c:494: grub_err_t getline (char **line, int cont __attribute__ ((unused))) grub-core/script/execute.c:524: getline (&line, 0); grub-core/script/execute.c:525: parsed_script = grub_script_parse (line, getline); grub-core/script/script.c:343:grub_script_parse (char *script, grub_reader_getline_t getline) grub-core/script/script.c:362: lexstate = grub_script_lexer_init (parsestate, script, getline); grub-core/script/main.c:25:grub_normal_parse_line (char *line, grub_reader_getline_t getline) grub-core/script/main.c:30: parsed_script = grub_script_parse (line, getline); I think we should take care to avoid any clash with symbols that are potentially renamed by gnulib. -- Colin Watson [cjwatson@ubuntu.com]