From 8e8834d8e599c0d36a5743f93984e3777eb6d35b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Wed, 14 Jun 2017 02:53:35 +0200
Subject: [PATCH] Remove RCSID tags

These are obsolete markers, and in some cases they repeat the
information already present in the comment header.
---
 src/expand_number.c | 2 --
 src/flopen.c        | 2 --
 src/fmtcheck.c      | 5 +++--
 src/fparseln.c      | 3 ---
 src/hash/sha512c.c  | 2 --
 src/inet_net_pton.c | 7 ++-----
 src/merge.c         | 4 ----
 src/pidfile.c       | 2 --
 src/radixsort.c     | 7 -------
 src/reallocf.c      | 1 -
 src/setmode.c       | 8 --------
 src/stringlist.c    | 3 ---
 src/strmode.c       | 4 ----
 src/strnstr.c       | 4 ----
 src/strtonum.c      | 1 -
 src/timeconv.c      | 2 --
 src/wcslcat.c       | 8 +-------
 src/wcslcpy.c       | 8 +-------
 18 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/src/expand_number.c b/src/expand_number.c
index 5d55884..57d875f 100644
--- a/src/expand_number.c
+++ b/src/expand_number.c
@@ -26,8 +26,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/src/flopen.c b/src/flopen.c
index b221988..aa506f5 100644
--- a/src/flopen.c
+++ b/src/flopen.c
@@ -26,8 +26,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/file.h>
 #include <sys/stat.h>
 
diff --git a/src/fmtcheck.c b/src/fmtcheck.c
index 4a18bba..7497257 100644
--- a/src/fmtcheck.c
+++ b/src/fmtcheck.c
@@ -24,11 +24,12 @@
  * 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.
+ *
+ *	from NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp
+ *	from FreeBSD: fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp
  */
 
-/*	$NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/fparseln.c b/src/fparseln.c
index effb849..6eada04 100644
--- a/src/fparseln.c
+++ b/src/fparseln.c
@@ -25,9 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $");
-#endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
index c2a93be..b3c8d5e 100644
--- a/src/hash/sha512c.c
+++ b/src/hash/sha512c.c
@@ -25,8 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/endian.h>
 #include <sys/types.h>
 
diff --git a/src/inet_net_pton.c b/src/inet_net_pton.c
index b0147f6..4614248 100644
--- a/src/inet_net_pton.c
+++ b/src/inet_net_pton.c
@@ -13,14 +13,11 @@
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
+ *
+ *	from FreeBSD: inet_net_pton.c,v 1.9 2003/09/15 23:38:06 fenner Exp
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-#endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.9 2003/09/15 23:38:06 fenner Exp $");
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/merge.c b/src/merge.c
index dc92b44..c43866f 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -30,11 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 /*
  * Hybrid exponential search/linear search merge sort with hybrid
diff --git a/src/pidfile.c b/src/pidfile.c
index 4e46367..b958cc1 100644
--- a/src/pidfile.c
+++ b/src/pidfile.c
@@ -25,8 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/src/radixsort.c b/src/radixsort.c
index 77ae52c..44d3a58 100644
--- a/src/radixsort.c
+++ b/src/radixsort.c
@@ -32,13 +32,6 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: radixsort.c,v 1.18 2009/08/21 20:49:50 dsl Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
 
 /*
  * Radixsort routines.
diff --git a/src/reallocf.c b/src/reallocf.c
index a85b5a3..d81b0ab 100644
--- a/src/reallocf.c
+++ b/src/reallocf.c
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <stdlib.h>
 
diff --git a/src/setmode.c b/src/setmode.c
index cdc2179..f65875e 100644
--- a/src/setmode.c
+++ b/src/setmode.c
@@ -33,14 +33,6 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
-#else
-__RCSID("$NetBSD: setmode.c,v 1.34 2012/06/25 22:32:43 abs Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/stringlist.c b/src/stringlist.c
index 6e5e488..d025dc0 100644
--- a/src/stringlist.c
+++ b/src/stringlist.c
@@ -30,9 +30,6 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: stringlist.c,v 1.12 2007/05/09 17:10:29 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
 #include <err.h>
diff --git a/src/strmode.c b/src/strmode.c
index 8d825ae..e6afde5 100644
--- a/src/strmode.c
+++ b/src/strmode.c
@@ -27,11 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
diff --git a/src/strnstr.c b/src/strnstr.c
index 4de757d..9bbccdd 100644
--- a/src/strnstr.c
+++ b/src/strnstr.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <string.h>
 
diff --git a/src/strtonum.c b/src/strtonum.c
index 6dccd97..1c722ab 100644
--- a/src/strtonum.c
+++ b/src/strtonum.c
@@ -18,7 +18,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/src/timeconv.c b/src/timeconv.c
index 7ee5388..11f926e 100644
--- a/src/timeconv.c
+++ b/src/timeconv.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <timeconv.h>
 
diff --git a/src/wcslcat.c b/src/wcslcat.c
index f5f1e1e..7643fe7 100644
--- a/src/wcslcat.c
+++ b/src/wcslcat.c
@@ -25,16 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp
+ *	from NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp
  */
 
 #include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <wchar.h>
 
diff --git a/src/wcslcpy.c b/src/wcslcpy.c
index b104a06..73fb35d 100644
--- a/src/wcslcpy.c
+++ b/src/wcslcpy.c
@@ -25,16 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
+ *	from NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp
  */
 
 #include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <wchar.h>