Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/regex/engine.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/regex/engine.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- src/lib/libc/regex/engine.c	2007/02/08 05:07:23	1.20
+++ src/lib/libc/regex/engine.c	2007/02/08 05:44:18	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: engine.c,v 1.20 2007/02/08 05:07:23 junyoung Exp $	*/
+/*	$NetBSD: engine.c,v 1.21 2007/02/08 05:44:18 junyoung Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -173,12 +173,12 @@ static int nope = 0;
  ==	size_t nmatch, regmatch_t pmatch[], int eflags);
  */
 static int			/* 0 success, REG_NOMATCH failure */
-matcher(g, string, nmatch, pmatch, eflags)
-struct re_guts *g;
-const char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
+matcher(
+    struct re_guts *g,
+    const char *string,
+    size_t nmatch,
+    regmatch_t pmatch[],
+    int eflags)
 {
 	const char *endp;
 	int i;
@@ -350,12 +350,12 @@ done:
  ==	const char *stop, sopno startst, sopno stopst);
  */
 static const char *			/* == stop (success) always */
-dissect(m, start, stop, startst, stopst)
-struct match *m;
-const char *start;
-const char *stop;
-sopno startst;
-sopno stopst;
+dissect(
+    struct match *m,
+    const char *start,
+    const char *stop,
+    sopno startst,
+    sopno stopst)
 {
 	int i;
 	sopno ss;	/* start sop of current subRE */
@@ -559,13 +559,13 @@ sopno stopst;
  ==	const char *stop, sopno startst, sopno stopst, sopno lev);
  */
 static const char *		/* == stop (success) or NULL (failure) */
-backref(m, start, stop, startst, stopst, lev)
-struct match *m;
-const char *start;
-const char *stop;
-sopno startst;
-sopno stopst;
-sopno lev;			/* PLUS nesting level */
+backref(
+    struct match *m,
+    const char *start,
+    const char *stop,
+    sopno startst,
+    sopno stopst,
+    sopno lev)			/* PLUS nesting level */
 {
 	int i;
 	sopno ss;	/* start sop of current subRE */
@@ -769,12 +769,12 @@ sopno lev;			/* PLUS nesting level */
  ==	const char *stop, sopno startst, sopno stopst);
  */
 static const char *		/* where tentative match ended, or NULL */
-fast(m, start, stop, startst, stopst)
-struct match *m;
-const char *start;
-const char *stop;
-sopno startst;
-sopno stopst;
+fast(
+    struct match *m,
+    const char *start,
+    const char *stop,
+    sopno startst,
+    sopno stopst)
 {
 	states st = m->st;
 	states fresh = m->fresh;
@@ -864,12 +864,12 @@ sopno stopst;
  ==	const char *stop, sopno startst, sopno stopst);
  */
 static const char *			/* where it ended */
-slow(m, start, stop, startst, stopst)
-struct match *m;
-const char *start;
-const char *stop;
-sopno startst;
-sopno stopst;
+slow(
+    struct match *m,
+    const char *start,
+    const char *stop,
+    sopno startst,
+    sopno stopst)
 {
 	states st = m->st;
 	states empty = m->empty;
@@ -964,13 +964,13 @@ sopno stopst;
  == #define	NNONCHAR	(CODEMAX-CHAR_MAX)
  */
 static states
-step(g, start, stop, bef, ch, aft)
-struct re_guts *g;
-sopno start;			/* start state within strip */
-sopno stop;			/* state after stop state within strip */
-states bef;		/* states reachable before */
-int ch;				/* character or NONCHAR code */
-states aft;		/* states already known reachable after */
+step(
+    struct re_guts *g,
+    sopno start,		/* start state within strip */
+    sopno stop,			/* state after stop state within strip */
+    states bef,			/* states reachable before */
+    int ch,			/* character or NONCHAR code */
+    states aft)			/* states already known reachable after */
 {
 	cset *cs;
 	sop s;
@@ -1088,12 +1088,12 @@ states aft;		/* states already known rea
  == #endif
  */
 static void
-print(m, caption, st, ch, d)
-struct match *m;
-char *caption;
-states st;
-int ch;
-FILE *d;
+print(
+    struct match *m,
+    char *caption,
+    states st,
+    int ch,
+    FILE *d)
 {
 	struct re_guts *g = m->g;
 	int i;
@@ -1126,13 +1126,13 @@ FILE *d;
  == #endif
  */
 static void
-at(m, title, start, stop, startst, stopst)
-struct match *m;
-char *title;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
+at(
+    struct match *m,
+    char *title,
+    char *start,
+    char *stop,
+    sopno startst,
+    sopno stopst)
 {
 
 	_DIAGASSERT(m != NULL);
@@ -1162,8 +1162,8 @@ sopno stopst;
  * the non-debug compilation anyway, so it doesn't matter much.
  */
 static char *			/* -> representation */
-pchar(ch)
-int ch;
+pchar(
+    int ch)
 {
 	static char pbuf[10];