Re: [PATCH] Fix getline name clash

[Colin Watson]

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                                       address@hidden