diff options
| author | Patrick Georgi <patrick.georgi@secunet.com> | 2011-01-28 07:40:08 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2011-01-28 07:40:08 +0000 |
| commit | bf64985e3b2d4edb59914042830da64d5354dcfb (patch) | |
| tree | 127ec30643352ea79be80d1b7f176166ae005625 /util/nvramtool/layout_file.c | |
| parent | 1c2734f5b67f08f8b440ca29b74831e05e4206bb (diff) | |
| download | coreboot-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/layout_file.c')
| -rw-r--r-- | util/nvramtool/layout_file.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/util/nvramtool/layout_file.c b/util/nvramtool/layout_file.c index 51b332ca0e..535554f704 100644 --- a/util/nvramtool/layout_file.c +++ b/util/nvramtool/layout_file.c @@ -262,14 +262,13 @@ void write_cmos_layout(FILE * f) ****************************************************************************/ static void process_layout_file(FILE * f) { - compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 7, - blank_or_comment_regex, &blank_or_comment_expr, - start_entries_regex, &start_entries_expr, - entries_line_regex, &entries_line_expr, - start_enums_regex, &start_enums_expr, - enums_line_regex, &enums_line_expr, - start_checksums_regex, &start_checksums_expr, - checksum_line_regex, &checksum_line_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, blank_or_comment_regex, &blank_or_comment_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, start_entries_regex, &start_entries_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, entries_line_regex, &entries_line_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, start_enums_regex, &start_enums_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, enums_line_regex, &enums_line_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, start_checksums_regex, &start_checksums_expr); + compile_reg_expr(REG_EXTENDED | REG_NEWLINE, checksum_line_regex, &checksum_line_expr); line_num = 1; skip_past_start(f); @@ -322,10 +321,13 @@ static void process_layout_file(FILE * f) */ skip_remaining_lines(f); - free_reg_exprs(7, &blank_or_comment_expr, &start_entries_expr, - &entries_line_expr, &start_enums_expr, - &enums_line_expr, &start_checksums_expr, - &checksum_line_expr); + regfree(&blank_or_comment_expr); + regfree(&start_entries_expr); + regfree(&entries_line_expr); + regfree(&start_enums_expr); + regfree(&enums_line_expr); + regfree(&start_checksums_expr); + regfree(&checksum_line_expr); } /**************************************************************************** |