moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

ini.c: reuse line buffer 

By the time we make the recursive call we have already finished with the
line buffer, making it safe to reuse.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-07-22 02:46:52 -04:00 committed by Allan McRae
parent 3d2c8e1fd0
commit bf1c8e3a3c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pacman/ini.c
View File

@ -34,16 +34,16 @@
* @param cb callback for key/value pairs
* @param data caller defined data to be passed to the callback
* @param section_name the name of the current section
* @param line buffer to read into, must be at least PATH_MAX long
* @param depth recursion depth, should initially be 0
*
* @return 0 on success, 1 on parsing errors, the callback return value
* otherwise
*/
static int _parse_ini(const char *file, ini_parser_fn cb, void *data,
char **section_name, int depth)
char **section_name, char *line, int depth)
{
FILE *fp = NULL;
char line[PATH_MAX];
int linenum = 0;
int ret = 0;
const int max_depth = 10;
@ -154,7 +154,7 @@ static int _parse_ini(const char *file, ini_parser_fn cb, void *data,
pm_printf(ALPM_LOG_DEBUG, "config file %s, line %d: including %s\n",
file, linenum, globbuf.gl_pathv[gindex]);
_parse_ini(globbuf.gl_pathv[gindex], cb, data,
section_name, depth + 1);
section_name, line, depth + 1);
}
break;
}
@ -204,8 +204,8 @@ cleanup:
*/
int parse_ini(const char *file, ini_parser_fn cb, void *data)
{
char *section_name = NULL;
return _parse_ini(file, cb, data, &section_name, 0);
char *section_name = NULL, line[PATH_MAX];
return _parse_ini(file, cb, data, &section_name, line, 0);
}
/* vim: set ts=2 sw=2 noet: */