From fbfb85d2836918c8381a60d528f004e7f0bbbe31 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 10 Nov 2017 13:50:52 +0100
Subject: [PATCH] libc: Move unused rcsid[] etc. constants into the  comments.

Found-by: gcc8
---
 lib/libc/inet/inet_ntoa.c         |  8 +++-----
 lib/libc/isc/ev_streams.c         |  6 ++----
 lib/libc/isc/ev_timers.c          |  6 ++----
 lib/libc/nameser/ns_name.c        |  6 ++----
 lib/libc/nameser/ns_netint.c      |  6 ++----
 lib/libc/nameser/ns_parse.c       |  6 ++----
 lib/libc/nameser/ns_print.c       |  6 ++----
 lib/libc/nameser/ns_samedomain.c  |  6 ++----
 lib/libc/nameser/ns_ttl.c         |  6 ++----
 lib/libc/resolv/herror.c          | 10 +++++-----
 lib/libc/resolv/res_comp.c        | 10 +++++-----
 lib/libc/resolv/res_data.c        |  6 ++----
 lib/libc/resolv/res_debug.c       | 10 +++++-----
 lib/libc/resolv/res_findzonecut.c |  6 ++----
 lib/libc/resolv/res_init.c        | 10 +++++-----
 lib/libc/resolv/res_mkquery.c     | 10 +++++-----
 lib/libc/resolv/res_mkupdate.c    |  6 ++----
 lib/libc/resolv/res_query.c       | 10 +++++-----
 lib/libc/resolv/res_send.c        | 10 +++++-----
 lib/libc/resolv/res_update.c      |  6 ++----
 20 files changed, 62 insertions(+), 88 deletions(-)

diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
index 38989f7d00..c027ea3cf2 100644
--- a/lib/libc/inet/inet_ntoa.c
+++ b/lib/libc/inet/inet_ntoa.c
@@ -25,13 +25,11 @@
  * 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.
+ *
+ * @(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93
+ * $Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
index eefebf424c..9b37da98a1 100644
--- a/lib/libc/isc/ev_streams.c
+++ b/lib/libc/isc/ev_streams.c
@@ -13,16 +13,14 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $
  */
 
 /* ev_streams.c - implement asynch stream file IO for the eventlib
  * vix 04mar96 [initial]
  */
 
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
-#endif
-
 #include "port_before.h"
 #ifndef _LIBC
 #include "fd_setsize.h"
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
index f36251a987..9fc89150c2 100644
--- a/lib/libc/isc/ev_timers.c
+++ b/lib/libc/isc/ev_timers.c
@@ -13,16 +13,14 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $
  */
 
 /* ev_timers.c - implement timers for the eventlib
  * vix 09sep95 [initial]
  */
 
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
-#endif
-
 /* Import. */
 
 #include "port_before.h"
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
index 9d409f3d95..a909bdf699 100644
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_name.c,v 1.10 2005/04/27 04:56:40 sra Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.10 2005/04/27 04:56:40 sra Exp $";
-#endif
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
index 559c9d5bd5..207687e8f3 100644
--- a/lib/libc/nameser/ns_netint.c
+++ b/lib/libc/nameser/ns_netint.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $";
-#endif
-
 /* Import. */
 
 #include "port_before.h"
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index 09b19f861c..ac1dcb70ad 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_parse.c,v 1.9 2007/08/27 03:32:26 marka Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.9 2007/08/27 03:32:26 marka Exp $";
-#endif
-
 /* Import. */
 
 #include "port_before.h"
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 4dc20dcfc9..f563d6c5ce 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_print.c,v 1.10 2005/04/27 04:56:40 sra Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.10 2005/04/27 04:56:40 sra Exp $";
-#endif
-
 /* Import. */
 
 #include "port_before.h"
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index ee890090b8..53061d5b4c 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $";
-#endif
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
index 69c2f83f57..4bbd4f0797 100644
--- a/lib/libc/nameser/ns_ttl.c
+++ b/lib/libc/nameser/ns_ttl.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $";
-#endif
-
 /* Import. */
 
 #include "port_before.h"
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index 6d0860d420..2aac244486 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)herror.c	8.1 (Berkeley) 6/4/93
+ * $Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $
+ */
+
+/*
  * Copyright (c) 1987, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -44,11 +49,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #ifdef _LIBC
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index f21dde5406..e93550da41 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_comp.c	8.1 (Berkeley) 6/4/93
+ * $Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $
+ */
+
+/*
  * Copyright (c) 1985, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -64,11 +69,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index d301872df1..32b3adcc0d 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -13,12 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: res_data.c,v 1.5 2007/09/14 05:32:25 marka Exp $
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c,v 1.5 2007/09/14 05:32:25 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index 9ad0206f0f..670e614590 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_debug.c	8.1 (Berkeley) 6/4/93
+ * $Id: res_debug.c,v 1.15.574.1 2008/04/03 02:12:21 marka Exp $
+ */
+
+/*
  * Copyright (c) 1985
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -89,11 +94,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.15.574.1 2008/04/03 02:12:21 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c
index ea778dbb29..31f71f1628 100644
--- a/lib/libc/resolv/res_findzonecut.c
+++ b/lib/libc/resolv/res_findzonecut.c
@@ -1,7 +1,3 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $";
-#endif /* not lint */
-
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999 by Internet Software Consortium.
@@ -17,6 +13,8 @@ static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 m
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $
  */
 
 /* Import. */
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index d920f89f4c..2db764a0aa 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_init.c	8.1 (Berkeley) 6/7/93
+ * $Id: res_init.c,v 1.23 2007/07/09 01:43:23 marka Exp $
+ */
+
+/*
  * Copyright (c) 1985, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -64,11 +69,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.23 2007/07/09 01:43:23 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 
 #ifdef _LIBC
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 6f0cff4e32..7736fe32f9 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_mkquery.c	8.1 (Berkeley) 6/4/93
+ * $Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp $
+ */
+
+/*
  * Copyright (c) 1985, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -64,11 +69,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 201c1d5902..e9e5e32847 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -13,6 +13,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: res_mkupdate.c,v 1.8 2005/10/14 05:44:26 marka Exp $
  */
 
 /*! \file
@@ -21,10 +23,6 @@
  * &lt;viraj_bais@ccm.fm.intel.com>
  */
 
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.8 2005/10/14 05:44:26 marka Exp $";
-#endif /* not lint */
-
 #include "port_before.h"
 
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 89e73b5b82..f23a7cdade 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_query.c	8.1 (Berkeley) 6/4/93
+ * $Id: res_query.c,v 1.8.672.2 2008/04/03 10:49:22 marka Exp $
+ */
+
+/*
  * Copyright (c) 1988, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -64,11 +69,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.8.672.2 2008/04/03 10:49:22 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "port_before.h"
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index 35ab0c9143..cc01a9a169 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,4 +1,9 @@
 /*
+ * @(#)res_send.c	8.1 (Berkeley) 6/4/93
+ * $Id: res_send.c,v 1.18.10.1 2008/01/27 02:06:46 marka Exp $
+ */
+
+/*
  * Copyright (c) 1985, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
  * 
@@ -64,11 +69,6 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.18.10.1 2008/01/27 02:06:46 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 /*! \file
  * \brief
  * Send query to name server and wait for reply.
diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c
index 63259e1c4d..0e76477f15 100644
--- a/lib/libc/resolv/res_update.c
+++ b/lib/libc/resolv/res_update.c
@@ -1,7 +1,3 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $";
-#endif /* not lint */
-
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-1999 by Internet Software Consortium.
@@ -17,6 +13,8 @@ static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Ex
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR 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.
+ *
+ * $Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $
  */
 
 /*! \file
-- 
2.11.4.GIT