Add constants for fast path resume copying

[coreboot.git] / util / nvramtool / reg_expr.c

diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index bd349712bd7dfa5be577466a38bf1ab47b83b654..7d1adbe0a1ffc370383400680e19522b36a39bf0 100644 (file)
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -25,7 +25,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 \*****************************************************************************/
 
 #include <stdarg.h>
@@ -33,48 +33,20 @@
 #include "reg_expr.h"
 
 /****************************************************************************
- * compile_reg_exprs
+ * compile_reg_expr
  *
- * Compile a bunch of regular expressions.
+ * Compile a regular expression.
  ****************************************************************************/
-void compile_reg_exprs (int cflags, int num_exprs,
-                        /* const char *expr1, regex_t *reg1, */ ...)
- { static const size_t ERROR_BUF_SIZE = 256;
-   char error_msg[ERROR_BUF_SIZE];
-   va_list ap;
-   regex_t *reg;
-   const char *expr;
-   int i, result;
+void compile_reg_expr(int cflags, const char *expr, regex_t *reg)
+{
+       static const size_t ERROR_BUF_SIZE = 256;
+       char error_msg[ERROR_BUF_SIZE];
+       int result;
+
+       if ((result = regcomp(reg, expr, cflags)) != 0) {
+               regerror(result, reg, error_msg, ERROR_BUF_SIZE);
+               fprintf(stderr, "%s: %s\n", prog_name, error_msg);
+               exit(1);
+       }
+}
 
-   va_start(ap, num_exprs);
-
-   for (i = 0; i < num_exprs; i++)
-    { expr = va_arg(ap, const char *);
-      reg  = va_arg(ap, regex_t *);
-
-      if ((result = regcomp(reg, expr, cflags)) != 0)
-       { regerror(result, reg, error_msg, ERROR_BUF_SIZE);
-         fprintf(stderr, "%s: %s\n", prog_name, error_msg);
-         exit(1);
-       }
-    }
-
-   va_end(ap);
- }
-
-/****************************************************************************
- * free_reg_exprs
- *
- * Destroy a bunch of previously compiled regular expressions.
- ****************************************************************************/
-void free_reg_exprs (int num_exprs, /* regex_t *reg1, */ ...)
- { va_list ap;
-   int i;
-
-   va_start(ap, num_exprs);
-
-   for (i = 0; i < num_exprs; i++)
-      regfree(va_arg(ap, regex_t *));
-
-   va_end(ap);
- }