From patchwork Thu Nov 1 22:25:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 992106 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42mKY04l3fzB4Zd for ; Fri, 2 Nov 2018 09:25:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726854AbeKBHa3 (ORCPT ); Fri, 2 Nov 2018 03:30:29 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55861 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726115AbeKBHa3 (ORCPT ); Fri, 2 Nov 2018 03:30:29 -0400 Received: by mail-wm1-f67.google.com with SMTP id s10-v6so366617wmc.5 for ; Thu, 01 Nov 2018 15:25:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ExXwSK4ilyj8Q5OLkWyZIfiqS4XJJ6LP7KErKBOhoRM=; b=pA7RMAZcZ1okqZF+IzQKDEp4zqyZHwrByh8yyb+Wsy45VXwsat23lQ/WNbe7/e5kPV i/rqlK5maEA2RQffuJzUic1m+dVoXkf90iWkF2dR7R6VY4MwZhwdcuxS48OeqsPvNcpW Fw+2TG4/IPChiWEunihOFf4TYqiRPtq9/7qoLcgcHNnI55duyibpC/7BjwxLIlCVaQsC 3wTUWrYPnRFW1ap2sKtwoghXcTmcAzExntG2eoxkKcMOW2uH2YvAlAogHEESEkSn0pCZ ci+75DonoRHxPIxYEPRZw5emEtLZiMDqmlKp15o0OLuGhMUf85GW21+cHNQDCazhI9ti 5z3Q== X-Gm-Message-State: AGRZ1gLHmrASrbfGkQSDQBi1xrOhjd9DJC6hClzyUF+LcsfvfOvnC6pZ LQvkoNSf1gX/W2o0+QRgZltx1Ka9 X-Google-Smtp-Source: AJdET5d2k8yPoPJDjlrOdwkPZPEocjEldPBOTcZYaYWKHd1+WN5QlHIFsE/tHBfM184uWn3nboQFqQ== X-Received: by 2002:a1c:da51:: with SMTP id r78-v6mr7233667wmg.39.1541111132539; Thu, 01 Nov 2018 15:25:32 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:1564:8cf4:7ed8:3ece]) by smtp.gmail.com with ESMTPSA id q17-v6sm4667974wrw.17.2018.11.01.15.25.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Nov 2018 15:25:31 -0700 (PDT) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, Luca Boccassi Subject: [PATCH iproute2] Include bsd/string.h only in include/utils.h Date: Thu, 1 Nov 2018 22:25:27 +0000 Message-Id: <20181101222527.29439-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is simpler and cleaner, and avoids having to include the header from every file where the functions are used. The prototypes of the internal implementation are in this header, so utils.h will have to be included anyway for those. Fixes: 508f3c231efb ("Use libbsd for strlcpy if available") Signed-off-by: Luca Boccassi --- genl/ctrl.c | 3 --- include/utils.h | 4 ++++ ip/iplink.c | 3 --- ip/ipnetns.c | 3 --- ip/iproute_lwtunnel.c | 3 --- ip/ipvrf.c | 3 --- ip/ipxfrm.c | 3 --- ip/tunnel.c | 3 --- ip/xfrm_state.c | 3 --- lib/bpf.c | 3 --- lib/fs.c | 3 --- lib/inet_proto.c | 3 --- misc/ss.c | 3 --- tc/em_ipset.c | 3 --- tc/m_pedit.c | 3 --- 15 files changed, 4 insertions(+), 42 deletions(-) diff --git a/genl/ctrl.c b/genl/ctrl.c index fef6aaa9..6133336a 100644 --- a/genl/ctrl.c +++ b/genl/ctrl.c @@ -18,9 +18,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include "utils.h" #include "genl_utils.h" diff --git a/include/utils.h b/include/utils.h index 685d2c1d..bf6dea23 100644 --- a/include/utils.h +++ b/include/utils.h @@ -9,6 +9,10 @@ #include #include +#ifdef HAVE_LIBBSD +#include +#endif + #include "libnetlink.h" #include "ll_map.h" #include "rtm_map.h" diff --git a/ip/iplink.c b/ip/iplink.c index 067f5409..b5519201 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -24,9 +24,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/ipnetns.c b/ip/ipnetns.c index da019d76..0eac18cf 100644 --- a/ip/ipnetns.c +++ b/ip/ipnetns.c @@ -8,9 +8,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c index 2285bc1d..8f497015 100644 --- a/ip/iproute_lwtunnel.c +++ b/ip/iproute_lwtunnel.c @@ -16,9 +16,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/ipvrf.c b/ip/ipvrf.c index 8572b4f2..8a6b7f97 100644 --- a/ip/ipvrf.c +++ b/ip/ipvrf.c @@ -21,9 +21,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index b02f30a6..17ab4abe 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -28,9 +28,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/tunnel.c b/ip/tunnel.c index 73abb2e2..d0d55f37 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -24,9 +24,6 @@ #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 18e0c6fa..e8c01746 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -27,9 +27,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include "utils.h" #include "xfrm.h" diff --git a/lib/bpf.c b/lib/bpf.c index 35d7c45a..45f279fa 100644 --- a/lib/bpf.c +++ b/lib/bpf.c @@ -15,9 +15,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/lib/fs.c b/lib/fs.c index af36bea0..86efd4ed 100644 --- a/lib/fs.c +++ b/lib/fs.c @@ -20,9 +20,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include diff --git a/lib/inet_proto.c b/lib/inet_proto.c index b379d8f8..0836a4c9 100644 --- a/lib/inet_proto.c +++ b/lib/inet_proto.c @@ -18,9 +18,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include "rt_names.h" #include "utils.h" diff --git a/misc/ss.c b/misc/ss.c index c472fbd9..4d12fb5d 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -19,9 +19,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include #include diff --git a/tc/em_ipset.c b/tc/em_ipset.c index 550b2101..48b287f5 100644 --- a/tc/em_ipset.c +++ b/tc/em_ipset.c @@ -20,9 +20,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include diff --git a/tc/m_pedit.c b/tc/m_pedit.c index baacc80d..2aeb56d9 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -23,9 +23,6 @@ #include #include #include -#ifdef HAVE_LIBBSD -#include -#endif #include #include "utils.h" #include "tc_util.h"