-/* $NetBSD: rxp.c,v 1.8 2002/08/06 03:39:44 dbj Exp $ */
+/* $NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#if 0
static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rxp.c,v 1.8 2002/08/06 03:39:44 dbj Exp $");
+__RCSID("$NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $");
#endif
#endif /* not lint */
*/
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include "quiz.h"
/* regexp tokens, arg */
static Rxp_t rxpbuf[RXP_LINE_SZ]; /* compiled regular expression buffer */
char rxperr[128]; /* parser error message */
-static int rxp__compile __P((const char *, int));
-static char *rxp__expand __P((int));
-static int rxp__match __P((const char *, int, Rxp_t *, Rxp_t *, const char *));
+static int rxp__compile(const char *, int);
+static char *rxp__expand(int);
+static int rxp__match(const char *, int, Rxp_t *, Rxp_t *, const char *);
int
-rxp_compile(s)
- const char * s;
+rxp_compile(const char *s)
{
return (rxp__compile(s, TRUE));
}
static int
-rxp__compile(s, first)
- const char *s;
- int first;
+rxp__compile(const char *s, int first)
{
static Rxp_t *rp;
static const char *sp;
* match string against compiled regular expression
*/
int
-rxp_match(s)
- const char * s;
+rxp_match(const char *s)
{
return (rxp__match(s, TRUE, NULL, NULL, NULL));
}
static int
-rxp__match(s, first, j_succ, j_fail, sp_fail)
- const char *s;
- int first;
- Rxp_t *j_succ; /* jump here on successful alt match */
- Rxp_t *j_fail; /* jump here on failed match */
- const char *sp_fail; /* reset sp to here on failed match */
+rxp__match(const char *s,
+ int first,
+ Rxp_t *j_succ, /* jump here on successful alt match */
+ Rxp_t *j_fail, /* jump here on failed match */
+ const char *sp_fail) /* reset sp to here on failed match */
{
static Rxp_t *rp;
static const char *sp;
int ch;
Rxp_t *grp_end = NULL;
- int err;
if (first) {
rp = rxpbuf;
* Reverse engineer the regular expression, by picking first of all alternates.
*/
char *
-rxp_expand()
+rxp_expand(void)
{
return (rxp__expand(TRUE));
}
static char *
-rxp__expand(first)
- int first;
+rxp__expand(int first)
{
static char buf[RXP_LINE_SZ/2];
static Rxp_t *rp;