[SSSD] [PATCH] Include external headers with #include <foo.h>

Jakub Hrozek jhrozek at redhat.com
Mon Oct 21 09:28:10 UTC 2013


Attached is a style patch. Feel free to ack or nack, it's just a
readability improvement.
-------------- next part --------------
>From d25f89e20417db947dc3c692411683b77b4ee7d7 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Wed, 2 Oct 2013 11:53:33 +0200
Subject: [PATCH] Include external headers with #include <foo.h>

I find it more readable to include headers from outside the sssd tree
with <foo.h>, not "foo.h". The latter should be used for in-tree headers
only.
---
 src/confdb/confdb.h                     |  9 +++++----
 src/monitor/monitor.c                   |  6 +++---
 src/providers/data_provider.h           |  9 +++++----
 src/providers/data_provider_be.c        |  4 ++--
 src/providers/dp_sbus.c                 |  5 +++--
 src/providers/proxy/proxy_child.c       |  4 ++--
 src/responder/common/responder.h        | 12 +++++++-----
 src/responder/common/responder_common.c |  3 ++-
 src/responder/common/responder_packet.c |  3 ++-
 src/responder/nss/nsssrv.c              |  4 ++--
 src/responder/nss/nsssrv.h              | 12 +++++++-----
 src/responder/pac/pacsrv.c              |  4 ++--
 src/responder/pac/pacsrv.h              | 13 ++++++++-----
 src/responder/pam/pamsrv.c              |  4 ++--
 src/sbus/sbus_client.c                  |  3 ++-
 src/sbus/sssd_dbus.h                    |  2 +-
 src/sbus/sssd_dbus_common.c             |  5 +++--
 src/sbus/sssd_dbus_connection.c         |  3 ++-
 src/sbus/sssd_dbus_server.c             |  4 ++--
 src/util/memory.c                       |  3 ++-
 src/util/util.c                         |  4 ++--
 21 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index 02fa2ea5a654bde7e55b8c7a49ec95575ae99782..939d4dd25032b76dff6e69743d094d83421bc25a 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -23,10 +23,11 @@
 #define _CONF_DB_H
 
 #include <stdbool.h>
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "ldb_errors.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <ldb_errors.h>
+
 #include "config.h"
 
 /**
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 3d8ba26285b6a8fc60ccb695f8b10ae1714ac918..7d8a150c2225533604e932d123993fbd1becd795 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -34,19 +34,19 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <popt.h>
+#include <tevent.h>
+#include <dbus/dbus.h>
 
 /* Needed for res_init() */
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 
-#include "popt.h"
-#include "tevent.h"
 #include "confdb/confdb.h"
 #include "confdb/confdb_setup.h"
 #include "db/sysdb.h"
 #include "monitor/monitor.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "monitor/monitor_interfaces.h"
 #include "responder/common/responder_sbus.h"
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index d086d5d2f368578c6a44a2c3b33738c894feba95..55891c9f2ceff1de76bc352e4421ce3090b9f12a 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -32,12 +32,13 @@
 #include <sys/types.h>
 #include <keyutils.h>
 #endif
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sbus_client.h"
 #include "sss_client/sss_cli.h"
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index 6b58d88ab4e0dd93960e6cb37e361adc7cfa52b9..e7037d8de6d28c85840f30c8d9ac5566a2ae8861 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -30,15 +30,15 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
 #include "db/sysdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/dp_backend.h"
 #include "providers/fail_over.h"
diff --git a/src/providers/dp_sbus.c b/src/providers/dp_sbus.c
index f9dd28216c17f675cb62d705c07d12fa2a6bb57f..623d7dd9cf813ccef6e585baa3d2799fc1232395 100644
--- a/src/providers/dp_sbus.c
+++ b/src/providers/dp_sbus.c
@@ -20,8 +20,9 @@
 */
 
 #include "config.h"
-#include "talloc.h"
-#include "tevent.h"
+#include <talloc.h>
+#include <tevent.h>
+
 #include "confdb/confdb.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/data_provider.h"
diff --git a/src/providers/proxy/proxy_child.c b/src/providers/proxy/proxy_child.c
index 66afcfb64fde68af2a7f0b820db185d4158aaf48..00fd38c96e0df5d27104fdfbce89f59d40b340a1 100644
--- a/src/providers/proxy/proxy_child.c
+++ b/src/providers/proxy/proxy_child.c
@@ -34,14 +34,14 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/proxy/proxy.h"
 
diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index 5331d5b759059c1a78f3ce70adf4d5a309079efb..fad16eb8913a673a85c187538a32937afb490f9f 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -22,15 +22,17 @@
 #ifndef __SSS_RESPONDER_H__
 #define __SSS_RESPONDER_H__
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/un.h>
 #include <pcre.h>
 #include <sys/resource.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dhash.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dhash.h>
+
 #include "sbus/sssd_dbus.h"
 #include "sss_client/sss_cli.h"
 
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 908031a0de7fb4df0f415b9b4adf94457d7f7e26..8a91887076cecc8cf5392b179948b4e9889cc941 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -32,11 +32,12 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <popt.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "util/strtonum.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder.h"
 #include "responder/common/responder_packet.h"
diff --git a/src/responder/common/responder_packet.c b/src/responder/common/responder_packet.c
index 6476bd6e59d6845042ab97bbc1846f9c76f68b57..ecee206b49c255a87791c7000f1103de0c78ffc7 100644
--- a/src/responder/common/responder_packet.c
+++ b/src/responder/common/responder_packet.c
@@ -23,7 +23,8 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
-#include "talloc.h"
+#include <talloc.h>
+
 #include "util/util.h"
 #include "responder/common/responder_packet.h"
 
diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
index a6e6d77f7fe7ced1dae7aa5fa57665681e19def7..0baa808450e085a32d998a7c9c343d8fc5c07775 100644
--- a/src/responder/nss/nsssrv.c
+++ b/src/responder/nss/nsssrv.c
@@ -29,8 +29,9 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "responder/nss/nsssrv.h"
 #include "responder/nss/nsssrv_private.h"
@@ -39,7 +40,6 @@
 #include "responder/common/negcache.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/nss/nsssrv.h b/src/responder/nss/nsssrv.h
index b279f8a766db88d61dbbb1eb0e3c658cec723c4b..2153d014fba1ea6975d273ab54ea6ecb09195aa1 100644
--- a/src/responder/nss/nsssrv.h
+++ b/src/responder/nss/nsssrv.h
@@ -22,13 +22,15 @@
 #ifndef __NSSSRV_H__
 #define __NSSSRV_H__
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/un.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dbus/dbus.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pac/pacsrv.c b/src/responder/pac/pacsrv.c
index a06d768bbc348f0a7f88428a6ce34d09bc3f5773..7a736adaea5806ca63de0b72a40ec308e8ba8629 100644
--- a/src/responder/pac/pacsrv.c
+++ b/src/responder/pac/pacsrv.c
@@ -29,13 +29,13 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "responder/pac/pacsrv.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pac/pacsrv.h b/src/responder/pac/pacsrv.h
index f90b40c67c2f3665025ef0addb8c14e2ea748fea..bda95eb0fac5351b67933ca7e3ceb7768b08ebff 100644
--- a/src/responder/pac/pacsrv.h
+++ b/src/responder/pac/pacsrv.h
@@ -21,6 +21,9 @@
 
 #ifndef __PACSRV_H__
 #define __PACSRV_H__
+
+#include "config.h"
+
 #include <stdbool.h>
 #include <util/data_blob.h>
 #include <ndr.h>
@@ -29,11 +32,11 @@
 
 #include <stdint.h>
 #include <sys/un.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dbus/dbus.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pam/pamsrv.c b/src/responder/pam/pamsrv.c
index fad564a049cbc6291fc3135577d8f313c7d4ff80..2e6afd087a863fd661c935d454e9eb7ab927428e 100644
--- a/src/responder/pam/pamsrv.c
+++ b/src/responder/pam/pamsrv.c
@@ -30,12 +30,12 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "providers/data_provider.h"
diff --git a/src/sbus/sbus_client.c b/src/sbus/sbus_client.c
index a06b28d2b817d4ad020ff3ee3204ac078b8adea4..992b2a25ceff6d1afeb3dec6f2814933f1e42b25 100644
--- a/src/sbus/sbus_client.c
+++ b/src/sbus/sbus_client.c
@@ -19,8 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <talloc.h>
+
 #include "util/util.h"
-#include "talloc.h"
 #include "sbus_client.h"
 
 int sbus_client_init(TALLOC_CTX *mem_ctx,
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index 49b09331efcaaa0800f8d0a8942117a97fdb7efd..7604797c1f8ef74deacacec2251606650ee2402d 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -24,7 +24,7 @@
 
 struct sbus_connection;
 
-#include "dbus/dbus.h"
+#include <dbus/dbus.h>
 
 typedef int (*sbus_msg_handler_fn)(DBusMessage *, struct sbus_connection *);
 
diff --git a/src/sbus/sssd_dbus_common.c b/src/sbus/sssd_dbus_common.c
index d16a763aea919b92bbdd8a65a20972878735f33d..baf74ec54083437dcc5a336fefb28ac6a7f5b85b 100644
--- a/src/sbus/sssd_dbus_common.c
+++ b/src/sbus/sssd_dbus_common.c
@@ -20,8 +20,9 @@
 */
 
 #include <sys/time.h>
-#include "tevent.h"
-#include "dbus/dbus.h"
+#include <tevent.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
diff --git a/src/sbus/sssd_dbus_connection.c b/src/sbus/sssd_dbus_connection.c
index ccea88e6d72dc78829c368bf46dd374043d9728e..c96a8f4c2f24a28477c7a49fa62f9825af994acf 100644
--- a/src/sbus/sssd_dbus_connection.c
+++ b/src/sbus/sssd_dbus_connection.c
@@ -20,8 +20,9 @@
 */
 
 #include <sys/time.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
 
diff --git a/src/sbus/sssd_dbus_server.c b/src/sbus/sssd_dbus_server.c
index 3ada25b6127ba23db8f03e7d02c16b43cd542056..5971189738d9fe2483913907b177c622f0dec00b 100644
--- a/src/sbus/sssd_dbus_server.c
+++ b/src/sbus/sssd_dbus_server.c
@@ -21,10 +21,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <tevent.h>
+#include <dbus/dbus.h>
 
-#include "tevent.h"
 #include "util/util.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
 
diff --git a/src/util/memory.c b/src/util/memory.c
index a2c8b54b819cb958698c1dc3e538bff8e07cf0b3..672129ee5e92ef27b96aa2a0c0354c424f687c70 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -18,7 +18,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "talloc.h"
+#include <talloc.h>
+
 #include "util/util.h"
 
 /*
diff --git a/src/util/util.c b/src/util/util.c
index 9ab154db327183b418df79fc8acbab216d12fec3..5931549f4ada45587602af51e872551d6d4849df 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -23,11 +23,11 @@
 #include <poll.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <talloc.h>
+#include <dhash.h>
 
-#include "talloc.h"
 #include "util/util.h"
 #include "util/sss_utf8.h"
-#include "dhash.h"
 
 int split_on_separator(TALLOC_CTX *mem_ctx, const char *str,
                        const char sep, bool trim, bool skip_empty,
-- 
1.8.3.1



More information about the sssd-devel mailing list