Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp906270yba; Wed, 15 May 2019 12:03:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzTfXf26emv7NOwJu55LqSis7iX187+L4NElu87BSBUlyGd2J+JepEZYeV0AzKEb8dH02KE X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr30580226plb.139.1557946991965; Wed, 15 May 2019 12:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557946991; cv=none; d=google.com; s=arc-20160816; b=VYP9JKLG6buZF3fP/cAvUBmhDmjPjm0hweAbH2Giq59Q09CLQoqYfpjq4AdNOcXapn +JF6ekqkxvZXfAc42AZ0/cBUyvI0Bi15W/t+75xGOEnBKhwo3dGUHcUlE9SDQemXFftn EDaAyQFD1xc43GA2g4+5DRJSTnjcmgjNIh7oXjUpz5BfaiJcBr4+RjeC6RZCiPC/q0eQ yRqZFJOZlv6TS47uZcJkJd2V6d5UN20upGmr/vvoCJxnuWQRasXow5ROwwa25gvCgZgu Cvy1J1kwlY6/c+IeCGXG//+HjBBLYLxNH76TbSb3Rn0DTqo8TKhSxz2gk+BymyPYVQo6 uX0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZyRKfkytNzDzYKJxK+GsMRhfeA0zOxY8qWieChBLgFM=; b=kkuRK/b+Nz1iU5yFo3XNdPIP7561/c2dtNoqUfxbD3HUeTSr073VgRIuxm1qiGuT2w U4Acbs6oVpZI/plpbfUV+g1dHB+f8GLgCgP7uLYI5e0wi0x8OyFbLola+17X5f5xPW5X P1Mh/4+y2mX/pJdwdZidjSy0aBP0XqAnpc6MccLwZw3nADCy2PQJLPT4Obm5vwSR6nbQ PiCjEsIKKFiIIVKxJ9iIIL6btg2j1kBhAqG+OUTYKUKLV5SdiGm8ev9Po20cCgikixET oBjWP6NIvSGuunrIjHpuRfPyAeYEsyK3hLybbDdzmltiAstYCNioJGHrdL5dxAiu4rKo mWEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d66si2826145pfa.201.2019.05.15.12.02.55; Wed, 15 May 2019 12:03:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726517AbfEOTAd (ORCPT + 99 others); Wed, 15 May 2019 15:00:33 -0400 Received: from mga18.intel.com ([134.134.136.126]:27572 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726387AbfEOTAd (ORCPT ); Wed, 15 May 2019 15:00:33 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 May 2019 12:00:32 -0700 X-ExtLoop1: 1 Received: from ingas-nuc1.sea.intel.com ([10.254.97.211]) by FMSMGA003.fm.intel.com with ESMTP; 15 May 2019 12:00:31 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, johan.hedberg@gmail.com, luiz.dentz@gmail.com, Inga Stotland Subject: [PATCH BlueZ 2/2] mesh: Remove unnecessary includes from .c files Date: Wed, 15 May 2019 12:00:19 -0700 Message-Id: <20190515190019.19710-3-inga.stotland@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515190019.19710-1-inga.stotland@intel.com> References: <20190515190019.19710-1-inga.stotland@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org --- mesh/agent.c | 1 - mesh/appkey.c | 2 -- mesh/cfgmod-server.c | 5 ----- mesh/crypto.c | 2 -- mesh/dbus.c | 10 ---------- mesh/friend.c | 6 ------ mesh/keyring.c | 7 +------ mesh/main.c | 7 ------- mesh/mesh-db.c | 1 - mesh/mesh-io-generic.c | 4 ---- mesh/mesh-io.c | 2 -- mesh/mesh.c | 3 +-- mesh/net-keys.c | 1 - mesh/net.c | 9 +-------- mesh/node.c | 6 ++---- mesh/pb-adv.c | 16 ---------------- mesh/prov-acceptor.c | 16 +--------------- mesh/prov-initiator.c | 16 +--------------- mesh/storage.c | 11 ++--------- mesh/util.c | 6 +----- 20 files changed, 10 insertions(+), 121 deletions(-) diff --git a/mesh/agent.c b/mesh/agent.c index b94ae77b0..4f99bad7b 100644 --- a/mesh/agent.c +++ b/mesh/agent.c @@ -24,7 +24,6 @@ #include #include "mesh/mesh.h" -#include "mesh/provision.h" #include "mesh/error.h" #include "mesh/dbus.h" #include "mesh/agent.h" diff --git a/mesh/appkey.c b/mesh/appkey.c index edf815c5a..412a2c48c 100644 --- a/mesh/appkey.c +++ b/mesh/appkey.c @@ -23,11 +23,9 @@ #define _GNU_SOURCE #include -#include #include "mesh/mesh-defs.h" -#include "mesh/mesh.h" #include "mesh/node.h" #include "mesh/net.h" #include "mesh/crypto.h" diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index a693881e5..060d7f4e4 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -21,17 +21,12 @@ #include #endif -#include -#include -#include #include #include -#include #include "json-c/json.h" #include "mesh/mesh-defs.h" -#include "mesh/mesh.h" #include "mesh/node.h" #include "mesh/net.h" #include "mesh/appkey.h" diff --git a/mesh/crypto.c b/mesh/crypto.c index f36518f68..085e72798 100644 --- a/mesh/crypto.c +++ b/mesh/crypto.c @@ -22,9 +22,7 @@ #endif #define _GNU_SOURCE -#include #include -#include #include #include diff --git a/mesh/dbus.c b/mesh/dbus.c index 083a7f77e..2b700a1ad 100644 --- a/mesh/dbus.c +++ b/mesh/dbus.c @@ -21,21 +21,11 @@ #include #endif -#include #include -#include - -#include "lib/bluetooth.h" -#include "lib/mgmt.h" - -#include "src/shared/mgmt.h" #include "mesh/mesh-defs.h" -#include "mesh/mesh-io.h" #include "mesh/node.h" #include "mesh/manager.h" -#include "mesh/net.h" -#include "mesh/cfgmod.h" #include "mesh/mesh.h" #include "mesh/error.h" #include "mesh/dbus.h" diff --git a/mesh/friend.c b/mesh/friend.c index 84a75a13b..da2772870 100644 --- a/mesh/friend.c +++ b/mesh/friend.c @@ -21,18 +21,12 @@ #include #endif -#include -#include -#include #include #include "mesh/mesh-defs.h" -#include "mesh/mesh.h" #include "mesh/net-keys.h" -#include "mesh/node.h" #include "mesh/net.h" -#include "mesh/crypto.h" #include "mesh/model.h" #include "mesh/util.h" diff --git a/mesh/keyring.c b/mesh/keyring.c index 4b1460aa8..4c6d2986d 100644 --- a/mesh/keyring.c +++ b/mesh/keyring.c @@ -22,24 +22,19 @@ #endif #define _GNU_SOURCE -#include #include #include #include #include -#include -#include #include #include #include "mesh/mesh-defs.h" -#include "mesh/net.h" -#include "mesh/keyring.h" -#include "mesh/mesh.h" #include "mesh/node.h" +#include "mesh/keyring.h" const char *dev_key_dir = "/dev_keys"; const char *app_key_dir = "/app_keys"; diff --git a/mesh/main.c b/mesh/main.c index 93a646895..a621300e6 100644 --- a/mesh/main.c +++ b/mesh/main.c @@ -23,25 +23,18 @@ #define _GNU_SOURCE #include -#include #include #include #include -#include #include #include -#include -#include - #include "lib/bluetooth.h" #include "lib/mgmt.h" #include "mesh/mesh.h" -#include "mesh/net.h" #include "mesh/dbus.h" -#include "mesh/storage.h" static const struct option main_options[] = { { "index", required_argument, NULL, 'i' }, diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c index 255a2e23e..5b2868fdb 100644 --- a/mesh/mesh-db.c +++ b/mesh/mesh-db.c @@ -23,7 +23,6 @@ #define _GNU_SOURCE #include -#include #include #include diff --git a/mesh/mesh-io-generic.c b/mesh/mesh-io-generic.c index 1a42c593f..756dceabc 100644 --- a/mesh/mesh-io-generic.c +++ b/mesh/mesh-io-generic.c @@ -24,15 +24,11 @@ #include #include -#include "lib/bluetooth.h" -#include "lib/hci.h" - #include "monitor/bt.h" #include "src/shared/hci.h" #include "mesh/mesh-io.h" #include "mesh/mesh-io-api.h" - #include "mesh/mesh-io-generic.h" struct mesh_io_private { diff --git a/mesh/mesh-io.c b/mesh/mesh-io.c index 8cf6c486a..37153ea9d 100644 --- a/mesh/mesh-io.c +++ b/mesh/mesh-io.c @@ -24,10 +24,8 @@ #include #include "lib/bluetooth.h" -#include "lib/hci.h" #include "mesh/mesh-defs.h" - #include "mesh/mesh-io.h" #include "mesh/mesh-io-api.h" diff --git a/mesh/mesh.c b/mesh/mesh.c index d5b6197b6..231a6bca4 100644 --- a/mesh/mesh.c +++ b/mesh/mesh.c @@ -23,7 +23,6 @@ #define _GNU_SOURCE #include -#include #include "lib/bluetooth.h" #include "lib/mgmt.h" @@ -38,8 +37,8 @@ #include "mesh/model.h" #include "mesh/dbus.h" #include "mesh/error.h" -#include "mesh/mesh.h" #include "mesh/agent.h" +#include "mesh/mesh.h" /* * The default values for mesh configuration. Can be diff --git a/mesh/net-keys.c b/mesh/net-keys.c index 0a0e58fb4..25f4caeb7 100644 --- a/mesh/net-keys.c +++ b/mesh/net-keys.c @@ -21,7 +21,6 @@ #include #endif -#include #include #include "mesh/crypto.h" diff --git a/mesh/net.c b/mesh/net.c index d808e9bd4..c7aff9ab4 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -22,18 +22,13 @@ #endif #define _GNU_SOURCE -#include -#include -#include + #include -#include #include "mesh/mesh-defs.h" #include "mesh/util.h" - #include "mesh/crypto.h" #include "mesh/net-keys.h" -#include "mesh/mesh.h" #include "mesh/node.h" #include "mesh/net.h" #include "mesh/mesh-io.h" @@ -41,8 +36,6 @@ #include "mesh/storage.h" #include "mesh/model.h" #include "mesh/appkey.h" -#include "mesh/prov.h" -#include "mesh/provision.h" #define abs_diff(a, b) ((a) > (b) ? (a) - (b) : (b) - (a)) diff --git a/mesh/node.c b/mesh/node.c index 8b8205301..394f5bfa9 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -22,21 +22,19 @@ #endif #define _GNU_SOURCE -#include + #include + #include #include #include "mesh/mesh-defs.h" - #include "mesh/mesh.h" -#include "mesh/mesh-io.h" #include "mesh/net.h" #include "mesh/mesh-db.h" #include "mesh/provision.h" #include "mesh/storage.h" #include "mesh/keyring.h" -#include "mesh/appkey.h" #include "mesh/model.h" #include "mesh/cfgmod.h" #include "mesh/util.h" diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c index 915bb1973..8762afd7c 100644 --- a/mesh/pb-adv.c +++ b/mesh/pb-adv.c @@ -21,25 +21,9 @@ #include #endif -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include #include "mesh/mesh-defs.h" -#include "src/shared/ecc.h" - -#include "mesh/util.h" -#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" #include "mesh/mesh-io.h" diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c index 2ec043679..7b79fa916 100644 --- a/mesh/prov-acceptor.c +++ b/mesh/prov-acceptor.c @@ -21,28 +21,14 @@ #include #endif -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include -#include "mesh/mesh-defs.h" #include "src/shared/ecc.h" +#include "mesh/mesh-defs.h" #include "mesh/util.h" -#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" -#include "mesh/error.h" #include "mesh/prov.h" #include "mesh/provision.h" #include "mesh/pb-adv.h" diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c index a1f29ca83..f147c7ad8 100644 --- a/mesh/prov-initiator.c +++ b/mesh/prov-initiator.c @@ -21,28 +21,14 @@ #include #endif -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include -#include "mesh/mesh-defs.h" #include "src/shared/ecc.h" +#include "mesh/mesh-defs.h" #include "mesh/util.h" -#include "mesh/net-keys.h" #include "mesh/crypto.h" #include "mesh/net.h" -#include "mesh/error.h" #include "mesh/prov.h" #include "mesh/provision.h" #include "mesh/pb-adv.h" diff --git a/mesh/storage.c b/mesh/storage.c index 2e10a4a00..1a9945aa8 100644 --- a/mesh/storage.c +++ b/mesh/storage.c @@ -22,7 +22,7 @@ #endif #define _GNU_SOURCE -#include +//#include #include #include #include @@ -30,23 +30,16 @@ #include #include -#include -#include - #include #include #include "mesh/mesh-defs.h" - -#include "mesh/mesh.h" #include "mesh/node.h" - #include "mesh/net.h" #include "mesh/appkey.h" -#include "mesh/model.h" #include "mesh/mesh-db.h" -#include "mesh/storage.h" #include "mesh/util.h" +#include "mesh/storage.h" struct write_info { json_object *jnode; diff --git a/mesh/util.c b/mesh/util.c index b3ce1ce5f..861232266 100644 --- a/mesh/util.c +++ b/mesh/util.c @@ -22,13 +22,9 @@ #endif #define _GNU_SOURCE -#include -#include + #include -#include -#include #include -#include #include #include -- 2.21.0