* [PATCH BlueZ 0/2] mesh source code housekeeping
@ 2019-05-15 19:00 Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 1/2] mesh: Update copyright dates Inga Stotland
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Inga Stotland @ 2019-05-15 19:00 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, johan.hedberg, luiz.dentz, Inga Stotland
This patch set updates copyright dates on the files that have been modified
in 2019 and cleans up the includelists in source files.
Inga Stotland (2):
mesh: Update copyright dates
mesh: Remove unnecessary includes from .c files
mesh/agent.c | 3 +--
mesh/appkey.c | 4 +---
mesh/appkey.h | 2 +-
mesh/cfgmod-server.c | 7 +------
mesh/crypto.c | 4 +---
mesh/dbus.c | 10 ----------
mesh/error.h | 2 +-
mesh/friend.c | 8 +-------
mesh/keyring.c | 7 +------
mesh/main.c | 7 -------
mesh/mesh-db.c | 3 +--
mesh/mesh-db.h | 2 +-
mesh/mesh-defs.h | 2 +-
mesh/mesh-io-generic.c | 6 +-----
mesh/mesh-io.c | 2 --
mesh/mesh.c | 5 ++---
mesh/model.c | 2 +-
mesh/net-keys.c | 3 +--
mesh/net-keys.h | 2 +-
mesh/net.c | 11 ++---------
mesh/net.h | 2 +-
mesh/node.c | 6 ++----
mesh/node.h | 2 +-
mesh/pb-adv.c | 18 +-----------------
mesh/prov-acceptor.c | 18 ++----------------
mesh/prov-initiator.c | 18 ++----------------
mesh/storage.c | 13 +++----------
mesh/storage.h | 2 +-
mesh/util.c | 6 +-----
29 files changed, 33 insertions(+), 144 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH BlueZ 1/2] mesh: Update copyright dates
2019-05-15 19:00 [PATCH BlueZ 0/2] mesh source code housekeeping Inga Stotland
@ 2019-05-15 19:00 ` Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 2/2] mesh: Remove unnecessary includes from .c files Inga Stotland
2019-05-17 20:18 ` [PATCH BlueZ 0/2] mesh source code housekeeping Gix, Brian
2 siblings, 0 replies; 4+ messages in thread
From: Inga Stotland @ 2019-05-15 19:00 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, johan.hedberg, luiz.dentz, Inga Stotland
---
mesh/agent.c | 2 +-
mesh/appkey.c | 2 +-
mesh/appkey.h | 2 +-
mesh/cfgmod-server.c | 2 +-
mesh/crypto.c | 2 +-
mesh/error.h | 2 +-
mesh/friend.c | 2 +-
mesh/mesh-db.c | 2 +-
mesh/mesh-db.h | 2 +-
mesh/mesh-defs.h | 2 +-
mesh/mesh-io-generic.c | 2 +-
mesh/mesh.c | 2 +-
mesh/model.c | 2 +-
mesh/net-keys.c | 2 +-
mesh/net-keys.h | 2 +-
mesh/net.c | 2 +-
mesh/net.h | 2 +-
mesh/node.h | 2 +-
mesh/pb-adv.c | 2 +-
mesh/prov-acceptor.c | 2 +-
mesh/prov-initiator.c | 2 +-
mesh/storage.c | 2 +-
mesh/storage.h | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/mesh/agent.c b/mesh/agent.c
index 88ad84d79..b94ae77b0 100644
--- a/mesh/agent.c
+++ b/mesh/agent.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/appkey.c b/mesh/appkey.c
index 3cc1e4f0b..edf815c5a 100644
--- a/mesh/appkey.c
+++ b/mesh/appkey.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2017-2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2017-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/appkey.h b/mesh/appkey.h
index eda82ac3b..1c22e801c 100644
--- a/mesh/appkey.h
+++ b/mesh/appkey.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 737aee376..a693881e5 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/crypto.c b/mesh/crypto.c
index 451e2da71..f36518f68 100644
--- a/mesh/crypto.c
+++ b/mesh/crypto.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/error.h b/mesh/error.h
index 1669c070a..f3e0f5476 100644
--- a/mesh/error.h
+++ b/mesh/error.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/friend.c b/mesh/friend.c
index 1722a2e71..84a75a13b 100644
--- a/mesh/friend.c
+++ b/mesh/friend.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c
index 01ae63146..255a2e23e 100644
--- a/mesh/mesh-db.c
+++ b/mesh/mesh-db.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/mesh-db.h b/mesh/mesh-db.h
index 19913148e..da5efa12a 100644
--- a/mesh/mesh-db.h
+++ b/mesh/mesh-db.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/mesh-defs.h b/mesh/mesh-defs.h
index 131b3502c..aba0d318f 100644
--- a/mesh/mesh-defs.h
+++ b/mesh/mesh-defs.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/mesh-io-generic.c b/mesh/mesh-io-generic.c
index 670c7ab97..1a42c593f 100644
--- a/mesh/mesh-io-generic.c
+++ b/mesh/mesh-io-generic.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 5e0bbb009..d5b6197b6 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/model.c b/mesh/model.c
index a632d80e1..034d54496 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/net-keys.c b/mesh/net-keys.c
index 4f85d5e52..0a0e58fb4 100644
--- a/mesh/net-keys.c
+++ b/mesh/net-keys.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/net-keys.h b/mesh/net-keys.h
index c752d3991..d54c52156 100644
--- a/mesh/net-keys.h
+++ b/mesh/net-keys.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/net.c b/mesh/net.c
index 9b1fbd81e..d808e9bd4 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/net.h b/mesh/net.h
index e040e19fa..f19024766 100644
--- a/mesh/net.h
+++ b/mesh/net.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/node.h b/mesh/node.h
index 6b481e46b..142527b30 100644
--- a/mesh/node.h
+++ b/mesh/node.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index a6104ca89..915bb1973 100644
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index a8bc2c9cf..2ec043679 100644
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index df8884a81..a1f29ca83 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/storage.c b/mesh/storage.c
index 8893b93cb..2e10a4a00 100644
--- a/mesh/storage.c
+++ b/mesh/storage.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2017-2018 Intel Corporation. All rights reserved.
+ * Copyright (C) 2017-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
diff --git a/mesh/storage.h b/mesh/storage.h
index d71d11b8e..a537ddb25 100644
--- a/mesh/storage.h
+++ b/mesh/storage.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2017-2918 Intel Corporation. All rights reserved.
+ * Copyright (C) 2017-2019 Intel Corporation. All rights reserved.
*
*
* This library is free software; you can redistribute it and/or
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH BlueZ 2/2] mesh: Remove unnecessary includes from .c files
2019-05-15 19:00 [PATCH BlueZ 0/2] mesh source code housekeeping Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 1/2] mesh: Update copyright dates Inga Stotland
@ 2019-05-15 19:00 ` Inga Stotland
2019-05-17 20:18 ` [PATCH BlueZ 0/2] mesh source code housekeeping Gix, Brian
2 siblings, 0 replies; 4+ messages in thread
From: Inga Stotland @ 2019-05-15 19:00 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, johan.hedberg, luiz.dentz, Inga Stotland
---
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 <ell/ell.h>
#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 <ell/ell.h>
-#include <json-c/json.h>
#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 <config.h>
#endif
-#include <unistd.h>
-#include <stdio.h>
-#include <stdint.h>
#include <sys/time.h>
#include <ell/ell.h>
-#include <ell/ell.h>
#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 <fcntl.h>
#include <unistd.h>
-#include <string.h>
#include <sys/socket.h>
#include <ell/ell.h>
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 <config.h>
#endif
-#include <time.h>
#include <ell/ell.h>
-#include <json-c/json.h>
-
-#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 <config.h>
#endif
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/time.h>
#include <ell/ell.h>
#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 <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
-#include <libgen.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <ell/ell.h>
#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 <getopt.h>
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
-#include <signal.h>
#include <sys/stat.h>
#include <ell/ell.h>
-#include <dbus/dbus.h>
-#include <json-c/json.h>
-
#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 <errno.h>
-#include <stdbool.h>
#include <stdio.h>
#include <string.h>
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 <sys/time.h>
#include <ell/ell.h>
-#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 <ell/ell.h>
#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 <ell/ell.h>
-#include <json-c/json.h>
#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 <config.h>
#endif
-#include <stdlib.h>
#include <ell/ell.h>
#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 <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
+
#include <ell/ell.h>
-#include <json-c/json.h>
#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 <stdio.h>
+
#include <sys/time.h>
+
#include <ell/ell.h>
#include <json-c/json.h>
#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 <config.h>
#endif
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <termios.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <getopt.h>
-#include <time.h>
#include <ell/ell.h>
#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 <config.h>
#endif
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <termios.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <getopt.h>
-#include <time.h>
#include <ell/ell.h>
-#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 <config.h>
#endif
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <termios.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <getopt.h>
-#include <time.h>
#include <ell/ell.h>
-#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 <errno.h>
+//#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
@@ -30,23 +30,16 @@
#include <libgen.h>
#include <ftw.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
#include <json-c/json.h>
#include <ell/ell.h>
#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 <stdbool.h>
-#include <stdint.h>
+
#include <stdio.h>
-#include <unistd.h>
-#include <termios.h>
#include <time.h>
-#include <sys/ioctl.h>
#include <sys/time.h>
#include <ell/ell.h>
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH BlueZ 0/2] mesh source code housekeeping
2019-05-15 19:00 [PATCH BlueZ 0/2] mesh source code housekeeping Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 1/2] mesh: Update copyright dates Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 2/2] mesh: Remove unnecessary includes from .c files Inga Stotland
@ 2019-05-17 20:18 ` Gix, Brian
2 siblings, 0 replies; 4+ messages in thread
From: Gix, Brian @ 2019-05-17 20:18 UTC (permalink / raw)
To: linux-bluetooth@vger.kernel.org, Stotland, Inga
Cc: luiz.dentz@gmail.com, johan.hedberg@gmail.com
Patch-set applied
On Wed, 2019-05-15 at 12:00 -0700, Inga Stotland wrote:
> This patch set updates copyright dates on the files that have been modified
> in 2019 and cleans up the includelists in source files.
>
> Inga Stotland (2):
> mesh: Update copyright dates
> mesh: Remove unnecessary includes from .c files
>
> mesh/agent.c | 3 +--
> mesh/appkey.c | 4 +---
> mesh/appkey.h | 2 +-
> mesh/cfgmod-server.c | 7 +------
> mesh/crypto.c | 4 +---
> mesh/dbus.c | 10 ----------
> mesh/error.h | 2 +-
> mesh/friend.c | 8 +-------
> mesh/keyring.c | 7 +------
> mesh/main.c | 7 -------
> mesh/mesh-db.c | 3 +--
> mesh/mesh-db.h | 2 +-
> mesh/mesh-defs.h | 2 +-
> mesh/mesh-io-generic.c | 6 +-----
> mesh/mesh-io.c | 2 --
> mesh/mesh.c | 5 ++---
> mesh/model.c | 2 +-
> mesh/net-keys.c | 3 +--
> mesh/net-keys.h | 2 +-
> mesh/net.c | 11 ++---------
> mesh/net.h | 2 +-
> mesh/node.c | 6 ++----
> mesh/node.h | 2 +-
> mesh/pb-adv.c | 18 +-----------------
> mesh/prov-acceptor.c | 18 ++----------------
> mesh/prov-initiator.c | 18 ++----------------
> mesh/storage.c | 13 +++----------
> mesh/storage.h | 2 +-
> mesh/util.c | 6 +-----
> 29 files changed, 33 insertions(+), 144 deletions(-)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-17 20:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-15 19:00 [PATCH BlueZ 0/2] mesh source code housekeeping Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 1/2] mesh: Update copyright dates Inga Stotland
2019-05-15 19:00 ` [PATCH BlueZ 2/2] mesh: Remove unnecessary includes from .c files Inga Stotland
2019-05-17 20:18 ` [PATCH BlueZ 0/2] mesh source code housekeeping Gix, Brian
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.