Ticket #12746: 0004-netresolv-fix-gcc6-build.patch

File 0004-netresolv-fix-gcc6-build.patch, 11.0 KB (added by mt, 8 years ago)

  • src/kits/network/netresolv/dst/dst_api.c 

    From cb60821090566bee594ad65f40fd3d3e2e0ce429 Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Wed, 4 May 2016 08:02:58 +0900
Subject: [PATCH 4/4] netresolv: fix gcc6 build

* Gcc6 warns some '-Werror=unused-const-variable=',
  but I don't know if these variables can be really removed.
  so marked as unused by attribute.
---
 src/kits/network/netresolv/dst/dst_api.c     | 2 +-
 src/kits/network/netresolv/dst/support.c     | 2 +-
 src/kits/network/netresolv/isc/assertions.c  | 2 +-
 src/kits/network/netresolv/isc/ctl_clnt.c    | 2 +-
 src/kits/network/netresolv/isc/ctl_p.c       | 2 +-
 src/kits/network/netresolv/isc/ctl_srvr.c    | 2 +-
 src/kits/network/netresolv/isc/ev_connects.c | 2 +-
 src/kits/network/netresolv/isc/ev_files.c    | 2 +-
 src/kits/network/netresolv/isc/ev_streams.c  | 2 +-
 src/kits/network/netresolv/isc/ev_timers.c   | 2 +-
 src/kits/network/netresolv/isc/ev_waits.c    | 2 +-
 src/kits/network/netresolv/isc/eventlib.c    | 2 +-
 src/kits/network/netresolv/isc/heap.c        | 2 +-
 src/kits/network/netresolv/isc/logging.c     | 2 +-
 src/kits/network/netresolv/isc/memcluster.c  | 2 +-
 src/kits/network/netresolv/isc/tree.c        | 2 +-
 src/kits/network/netresolv/nameser/ns_name.c | 2 +-
 src/kits/network/netresolv/resolv/res_init.c | 2 +-
 src/kits/network/netresolv/resolv/res_send.c | 2 ++
 19 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/kits/network/netresolv/dst/dst_api.c b/src/kits/network/netresolv/dst/dst_api.c
index 931af41..85c44c0 100644
    a b  
    11#ifndef LINT
    2 static const char rcsid[] = "$Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp $";
     2static const char rcsid[] __attribute__((__unused__)) = "$Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp $";
    33#endif
    44
    55/*

  • src/kits/network/netresolv/dst/support.c 

    diff --git a/src/kits/network/netresolv/dst/support.c b/src/kits/network/netresolv/dst/support.c
index 730397f..151e43a 100644
    a b  
    1 static const char rcsid[] = "$Header: /proj/cvs/prod/libbind/dst/support.c,v 1.6 2005/10/11 00:10:13 marka Exp $";
     1static const char rcsid[] __attribute__((__unused__)) = "$Header: /proj/cvs/prod/libbind/dst/support.c,v 1.6 2005/10/11 00:10:13 marka Exp $";
    22
    33
    44/*

  • src/kits/network/netresolv/isc/assertions.c 

    diff --git a/src/kits/network/netresolv/isc/assertions.c b/src/kits/network/netresolv/isc/assertions.c
index b71e5a3..4eac833 100644
    a b  
    1616 */
    1717
    1818#if !defined(LINT) && !defined(CODECENTER)
    19 static const char rcsid[] = "$Id: assertions.c,v 1.5 2008/11/14 02:36:51 marka Exp $";
     19static const char rcsid[] __attribute__((__unused__)) = "$Id: assertions.c,v 1.5 2008/11/14 02:36:51 marka Exp $";
    2020#endif
    2121
    2222#include "port_before.h"

  • src/kits/network/netresolv/isc/ctl_clnt.c 

    diff --git a/src/kits/network/netresolv/isc/ctl_clnt.c b/src/kits/network/netresolv/isc/ctl_clnt.c
index f71001a..9aed3f1 100644
    a b  
    1616 */
    1717
    1818#if !defined(lint) && !defined(SABER)
    19 static const char rcsid[] = "$Id: ctl_clnt.c,v 1.11 2008/11/14 02:36:51 marka Exp $";
     19static const char rcsid[] __attribute__((__unused__)) = "$Id: ctl_clnt.c,v 1.11 2008/11/14 02:36:51 marka Exp $";
    2020#endif /* not lint */
    2121
    2222/* Extern. */

  • src/kits/network/netresolv/isc/ctl_p.c 

    diff --git a/src/kits/network/netresolv/isc/ctl_p.c b/src/kits/network/netresolv/isc/ctl_p.c
index 7ab719a..e221345 100644
    a b  
    11#if !defined(lint) && !defined(SABER)
    2 static const char rcsid[] = "$Id: ctl_p.c,v 1.4 2005/04/27 04:56:35 sra Exp $";
     2static const char rcsid[] __attribute__((__unused__)) = "$Id: ctl_p.c,v 1.4 2005/04/27 04:56:35 sra Exp $";
    33#endif /* not lint */
    44
    55/*

  • src/kits/network/netresolv/isc/ctl_srvr.c 

    diff --git a/src/kits/network/netresolv/isc/ctl_srvr.c b/src/kits/network/netresolv/isc/ctl_srvr.c
index 8fd7a21..0a2e20c 100644
    a b  
    1616 */
    1717
    1818#if !defined(lint) && !defined(SABER)
    19 static const char rcsid[] = "$Id: ctl_srvr.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
     19static const char rcsid[] __attribute__((__unused__)) = "$Id: ctl_srvr.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
    2020#endif /* not lint */
    2121
    2222/* Extern. */

  • src/kits/network/netresolv/isc/ev_connects.c 

    diff --git a/src/kits/network/netresolv/isc/ev_connects.c b/src/kits/network/netresolv/isc/ev_connects.c
index 38dfdbe..5a7a23e 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: ev_connects.c,v 1.8 2006/03/09 23:57:56 marka Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: ev_connects.c,v 1.8 2006/03/09 23:57:56 marka Exp $";
    2424#endif
    2525
    2626/* Import. */

  • src/kits/network/netresolv/isc/ev_files.c 

    diff --git a/src/kits/network/netresolv/isc/ev_files.c b/src/kits/network/netresolv/isc/ev_files.c
index b12baf1..62b7a3d 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: ev_files.c,v 1.8 2005/07/28 06:51:48 marka Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: ev_files.c,v 1.8 2005/07/28 06:51:48 marka Exp $";
    2424#endif
    2525
    2626#include "port_before.h"

  • src/kits/network/netresolv/isc/ev_streams.c 

    diff --git a/src/kits/network/netresolv/isc/ev_streams.c b/src/kits/network/netresolv/isc/ev_streams.c
index 5dad36d..355ef73 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
    2424#endif
    2525
    2626#include "port_before.h"

  • src/kits/network/netresolv/isc/ev_timers.c 

    diff --git a/src/kits/network/netresolv/isc/ev_timers.c b/src/kits/network/netresolv/isc/ev_timers.c
index 12ac2ce..d473bf0 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
    2424#endif
    2525
    2626/* Import. */

  • src/kits/network/netresolv/isc/ev_waits.c 

    diff --git a/src/kits/network/netresolv/isc/ev_waits.c b/src/kits/network/netresolv/isc/ev_waits.c
index 99da152..4f5228b 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: ev_waits.c,v 1.4 2005/04/27 04:56:36 sra Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: ev_waits.c,v 1.4 2005/04/27 04:56:36 sra Exp $";
    2424#endif
    2525
    2626#include "port_before.h"

  • src/kits/network/netresolv/isc/eventlib.c 

    diff --git a/src/kits/network/netresolv/isc/eventlib.c b/src/kits/network/netresolv/isc/eventlib.c
index 6daf8e1..8f26dda 100644
    a b  
    2020 */
    2121
    2222#if !defined(LINT) && !defined(CODECENTER)
    23 static const char rcsid[] = "$Id: eventlib.c,v 1.10 2006/03/09 23:57:56 marka Exp $";
     23static const char rcsid[] __attribute__((__unused__)) = "$Id: eventlib.c,v 1.10 2006/03/09 23:57:56 marka Exp $";
    2424#endif
    2525
    2626#include "port_before.h"

  • src/kits/network/netresolv/isc/heap.c 

    diff --git a/src/kits/network/netresolv/isc/heap.c b/src/kits/network/netresolv/isc/heap.c
index 3d22b6f..75b268a 100644
    a b  
    2626 */
    2727
    2828#if !defined(LINT) && !defined(CODECENTER)
    29 static const char rcsid[] = "$Id: heap.c,v 1.4 2006/03/09 23:57:56 marka Exp $";
     29static const char rcsid[] __attribute__((__unused__)) = "$Id: heap.c,v 1.4 2006/03/09 23:57:56 marka Exp $";
    3030#endif /* not lint */
    3131
    3232#include "port_before.h"

  • src/kits/network/netresolv/isc/logging.c 

    diff --git a/src/kits/network/netresolv/isc/logging.c b/src/kits/network/netresolv/isc/logging.c
index 8c2af2b..c639e64 100644
    a b  
    1616 */
    1717
    1818#if !defined(LINT) && !defined(CODECENTER)
    19 static const char rcsid[] = "$Id: logging.c,v 1.9 2008/11/14 02:36:51 marka Exp $";
     19static const char rcsid[] __attribute__((__unused__)) = "$Id: logging.c,v 1.9 2008/11/14 02:36:51 marka Exp $";
    2020#endif /* not lint */
    2121
    2222#include "port_before.h"

  • src/kits/network/netresolv/isc/memcluster.c 

    diff --git a/src/kits/network/netresolv/isc/memcluster.c b/src/kits/network/netresolv/isc/memcluster.c
index 515793f..610c1c2 100644
    a b  
    2424
    2525
    2626#if !defined(LINT) && !defined(CODECENTER)
    27 static const char rcsid[] = "$Id: memcluster.c,v 1.11 2006/08/30 23:34:38 marka Exp $";
     27static const char rcsid[] __attribute__((__unused__)) = "$Id: memcluster.c,v 1.11 2006/08/30 23:34:38 marka Exp $";
    2828#endif /* not lint */
    2929
    3030#include "port_before.h"

  • src/kits/network/netresolv/isc/tree.c 

    diff --git a/src/kits/network/netresolv/isc/tree.c b/src/kits/network/netresolv/isc/tree.c
index ee6454f..4e592bf 100644
    a b  
    11#ifndef LINT
    2 static const char rcsid[] = "$Id: tree.c,v 1.4 2005/04/27 04:56:39 sra Exp $";
     2static const char rcsid[] __attribute__((__unused__)) = "$Id: tree.c,v 1.4 2005/04/27 04:56:39 sra Exp $";
    33#endif
    44
    55/*%

  • src/kits/network/netresolv/nameser/ns_name.c 

    diff --git a/src/kits/network/netresolv/nameser/ns_name.c b/src/kits/network/netresolv/nameser/ns_name.c
index 75afb08..e87343c 100644
    a b  
    1818 */
    1919
    2020#ifndef lint
    21 static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
     21static const char rcsid[] __attribute__((__unused__)) = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
    2222#endif
    2323
    2424#include "port_before.h"

  • src/kits/network/netresolv/resolv/res_init.c 

    diff --git a/src/kits/network/netresolv/resolv/res_init.c b/src/kits/network/netresolv/resolv/res_init.c
index 74c665a..22d1ca7 100644
    a b static uint32_t net_mask __P((struct in_addr));  
    131131# define isascii(c) (!(c & 0200))
    132132#endif
    133133
    134 static const struct timespec ts = { 0, 0 };
     134static const struct timespec ts __attribute__((__unused__)) = { 0, 0 };
    135135
    136136/*
    137137 * Resolver state default settings.

  • src/kits/network/netresolv/resolv/res_send.c 

    diff --git a/src/kits/network/netresolv/resolv/res_send.c b/src/kits/network/netresolv/resolv/res_send.c
index 2109413..3f76b75 100644
    a b static int pselect(int, void *, void *, void *,  
    174174#endif
    175175void res_pquery(const res_state, const u_char *, int, FILE *);
    176176
     177#ifdef DEBUG
    177178static const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
     179#endif
    178180
    179181/* Public. */
    180182