summaryrefslogtreecommitdiff
path: root/util/nvramtool/input_file.c
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-01-28 07:40:08 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2011-01-28 07:40:08 +0000
commitbf64985e3b2d4edb59914042830da64d5354dcfb (patch)
tree127ec30643352ea79be80d1b7f176166ae005625 /util/nvramtool/input_file.c
parent1c2734f5b67f08f8b440ca29b74831e05e4206bb (diff)
downloadcoreboot-bf64985e3b2d4edb59914042830da64d5354dcfb.tar.xz
No need to add varargs magic to a simple regex wrapper.
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6308 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/nvramtool/input_file.c')
-rw-r--r--util/nvramtool/input_file.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c
index 38214d90c0..1520930175 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -88,8 +88,8 @@ cmos_write_t *process_input_file(FILE * f)
list = NULL;
p = &list;
- compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 2, blank_or_comment_regex,
- &blank_or_comment, assignment_regex, &assignment);
+ compile_reg_expr(REG_EXTENDED | REG_NEWLINE, blank_or_comment_regex, &blank_or_comment);
+ compile_reg_expr(REG_EXTENDED | REG_NEWLINE, assignment_regex, &assignment);
/* each iteration processes one line from input file */
for (line_num = 1; get_input_file_line(f, line, LINE_BUF_SIZE) == OK; line_num++) { /* skip comments and blank lines */
@@ -142,7 +142,8 @@ cmos_write_t *process_input_file(FILE * f)
p = &item->next;
}
- free_reg_exprs(2, &blank_or_comment, &assignment);
+ regfree(&blank_or_comment);
+ regfree(&assignment);
return list;
}