 @@ -1,14 +1,14 @@
-/*	$NetBSD: regsub.c,v 1.3 2016/01/20 15:12:29 christos Exp $	*/
+/*	$NetBSD: regsub.c,v 1.4 2016/01/21 04:55:40 mrg Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -18,27 +18,29 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 extern "C" {
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <regex.h>
 struct str {
 	char *s_ptr;
 	size_t s_max;
 	size_t s_len;
 	int s_fixed;
 };
 @@ -148,13 +150,15 @@ regsub1(char **buf, size_t len, const ch
 ssize_t
 regnsub(char *buf, size_t len, const char *sub, const regmatch_t *rm,
     const char *str)
+{
 	return regsub1(&buf, len, sub, rm, str);
+}
 ssize_t
 regasub(char **buf, const char *sub, const regmatch_t *rm, const char *str)
+{
 	*buf = NULL;
 	return regsub1(buf, REINCR, sub, rm, str);
+}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: regsub.c,v 1.3 2016/01/20 15:13:33 christos Exp $	*/
+/*	$NetBSD: regsub.c,v 1.4 2016/01/21 04:55:40 mrg Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -18,26 +18,29 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 extern "C" {
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <regex.h>
 struct str {
 	char *s_ptr;
 	size_t s_max;
 	size_t s_len;
 	int s_fixed;
 };
 @@ -147,13 +150,15 @@ regsub1(char **buf, size_t len, const ch
 ssize_t
 regnsub(char *buf, size_t len, const char *sub, const regmatch_t *rm,
     const char *str)
+{
 	return regsub1(&buf, len, sub, rm, str);
+}
 ssize_t
 regasub(char **buf, const char *sub, const regmatch_t *rm, const char *str)
+{
 	*buf = NULL;
 	return regsub1(buf, REINCR, sub, rm, str);
+}
+}