diff mbox series

[v1] libmnl src: Use double quotes in #includes for non-system headers

Message ID 20180605052816.20356-1-duncan_roe@optusnet.com.au
State Changes Requested
Delegated to: Pablo Neira
Headers show
Series [v1] libmnl src: Use double quotes in #includes for non-system headers | expand

Commit Message

Duncan Roe June 5, 2018, 5:28 a.m. UTC 
libmnl carries a private copy of a number of system headers. These were mostly
still being included with angle brackets as though they were system headers.
Tested configurations of gcc would pick up the private copy in these cases but
it has been reported that others do not.

By using double quotes, developers are reminded that the code is using a
private header which may differ from the system one.

(In fact ./include/linux/netlink.h differs considerably from
/usr/include/linux/netlink.h at kernel-headers-4.4.14 and even more so at
kernel-headers-4.16.12).

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 examples/genl/genl-family-get.c        | 2 +-
 examples/genl/genl-group-events.c      | 2 +-
 examples/kobject/kobject-event.c       | 4 ++--
 examples/netfilter/nf-log.c            | 2 +-
 examples/netfilter/nf-queue.c          | 2 +-
 examples/netfilter/nfct-create-batch.c | 4 ++--
 examples/netfilter/nfct-daemon.c       | 6 +++---
 examples/netfilter/nfct-dump.c         | 4 ++--
 examples/netfilter/nfct-event.c        | 4 ++--
 examples/rtnl/rtnl-addr-dump.c         | 2 +-
 examples/rtnl/rtnl-link-dump.c         | 2 +-
 examples/rtnl/rtnl-link-dump2.c        | 2 +-
 examples/rtnl/rtnl-link-dump3.c        | 2 +-
 examples/rtnl/rtnl-link-event.c        | 2 +-
 examples/rtnl/rtnl-link-set.c          | 2 +-
 examples/rtnl/rtnl-route-add.c         | 2 +-
 examples/rtnl/rtnl-route-dump.c        | 2 +-
 examples/rtnl/rtnl-route-event.c       | 2 +-
 include/libmnl/libmnl.h                | 2 +-
 include/linux/netlink.h                | 2 +-
 src/attr.c                             | 2 +-
 src/callback.c                         | 2 +-
 src/nlmsg.c                            | 2 +-
 src/socket.c                           | 2 +-
 24 files changed, 30 insertions(+), 30 deletions(-)
diff mbox series

Patch

diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c
index ba8de12..3d6b305 100644
--- a/examples/genl/genl-family-get.c
+++ b/examples/genl/genl-family-get.c
@@ -4,7 +4,7 @@ 
 #include <unistd.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/genetlink.h>
 
 static int parse_mc_grps_cb(const struct nlattr *attr, void *data)
diff --git a/examples/genl/genl-group-events.c b/examples/genl/genl-group-events.c
index d5f0a18..3cb61d4 100644
--- a/examples/genl/genl-group-events.c
+++ b/examples/genl/genl-group-events.c
@@ -4,7 +4,7 @@ 
 #include <unistd.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/genetlink.h>
 
 static int group;
diff --git a/examples/kobject/kobject-event.c b/examples/kobject/kobject-event.c
index 97debdf..3808549 100644
--- a/examples/kobject/kobject-event.c
+++ b/examples/kobject/kobject-event.c
@@ -4,8 +4,8 @@ 
 #include <unistd.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
-#include <linux/netlink.h>
+#include "libmnl/libmnl.h"
+#include "linux/netlink.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/netfilter/nf-log.c b/examples/netfilter/nf-log.c
index 4383b66..a873c63 100644
--- a/examples/netfilter/nf-log.c
+++ b/examples/netfilter/nf-log.c
@@ -6,7 +6,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
diff --git a/examples/netfilter/nf-queue.c b/examples/netfilter/nf-queue.c
index 957e365..409b974 100644
--- a/examples/netfilter/nf-queue.c
+++ b/examples/netfilter/nf-queue.c
@@ -6,7 +6,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_queue.h>
diff --git a/examples/netfilter/nfct-create-batch.c b/examples/netfilter/nfct-create-batch.c
index 4675789..46d6592 100644
--- a/examples/netfilter/nfct-create-batch.c
+++ b/examples/netfilter/nfct-create-batch.c
@@ -7,9 +7,9 @@ 
 #include <sys/select.h>
 #include <string.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_conntrack.h>
+#include "linux/netfilter/nfnetlink_conntrack.h"
 #include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
 
diff --git a/examples/netfilter/nfct-daemon.c b/examples/netfilter/nfct-daemon.c
index d223ac2..b63ae0b 100644
--- a/examples/netfilter/nfct-daemon.c
+++ b/examples/netfilter/nfct-daemon.c
@@ -15,10 +15,10 @@ 
 #include <errno.h>
 #include <sys/select.h>
 
-#include <libmnl/libmnl.h>
-#include <linux/netlink.h>
+#include "libmnl/libmnl.h"
+#include "linux/netlink.h"
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_conntrack.h>
+#include "linux/netfilter/nfnetlink_conntrack.h"
 
 #include <sys/queue.h>
 
diff --git a/examples/netfilter/nfct-dump.c b/examples/netfilter/nfct-dump.c
index 114af61..afce75f 100644
--- a/examples/netfilter/nfct-dump.c
+++ b/examples/netfilter/nfct-dump.c
@@ -7,9 +7,9 @@ 
 #include <arpa/inet.h>
 #include <inttypes.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_conntrack.h>
+#include "linux/netfilter/nfnetlink_conntrack.h"
 
 static int parse_counters_cb(const struct nlattr *attr, void *data)
 {
diff --git a/examples/netfilter/nfct-event.c b/examples/netfilter/nfct-event.c
index 94603d4..6b07751 100644
--- a/examples/netfilter/nfct-event.c
+++ b/examples/netfilter/nfct-event.c
@@ -4,9 +4,9 @@ 
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_conntrack.h>
+#include "linux/netfilter/nfnetlink_conntrack.h"
 
 static int parse_ip_cb(const struct nlattr *attr, void *data)
 {
diff --git a/examples/rtnl/rtnl-addr-dump.c b/examples/rtnl/rtnl-addr-dump.c
index b92b75f..3d59a48 100644
--- a/examples/rtnl/rtnl-addr-dump.c
+++ b/examples/rtnl/rtnl-addr-dump.c
@@ -6,7 +6,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-link-dump.c b/examples/rtnl/rtnl-link-dump.c
index f5d6312..70334fa 100644
--- a/examples/rtnl/rtnl-link-dump.c
+++ b/examples/rtnl/rtnl-link-dump.c
@@ -5,7 +5,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-link-dump2.c b/examples/rtnl/rtnl-link-dump2.c
index b3ca3fa..08e79c1 100644
--- a/examples/rtnl/rtnl-link-dump2.c
+++ b/examples/rtnl/rtnl-link-dump2.c
@@ -4,7 +4,7 @@ 
 #include <unistd.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-link-dump3.c b/examples/rtnl/rtnl-link-dump3.c
index 2521214..771d0bd 100644
--- a/examples/rtnl/rtnl-link-dump3.c
+++ b/examples/rtnl/rtnl-link-dump3.c
@@ -4,7 +4,7 @@ 
 #include <unistd.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-link-event.c b/examples/rtnl/rtnl-link-event.c
index 123fb88..514bac3 100644
--- a/examples/rtnl/rtnl-link-event.c
+++ b/examples/rtnl/rtnl-link-event.c
@@ -3,7 +3,7 @@ 
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-link-set.c b/examples/rtnl/rtnl-link-set.c
index 6086c37..f97125c 100644
--- a/examples/rtnl/rtnl-link-set.c
+++ b/examples/rtnl/rtnl-link-set.c
@@ -5,7 +5,7 @@ 
 #include <string.h>
 #include <time.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-route-add.c b/examples/rtnl/rtnl-route-add.c
index 97578cd..47be399 100644
--- a/examples/rtnl/rtnl-route-add.c
+++ b/examples/rtnl/rtnl-route-add.c
@@ -8,7 +8,7 @@ 
 #include <strings.h>
 #include <net/if.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
 
diff --git a/examples/rtnl/rtnl-route-dump.c b/examples/rtnl/rtnl-route-dump.c
index 17da80b..bb76aa3 100644
--- a/examples/rtnl/rtnl-route-dump.c
+++ b/examples/rtnl/rtnl-route-dump.c
@@ -6,7 +6,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/examples/rtnl/rtnl-route-event.c b/examples/rtnl/rtnl-route-event.c
index 6cad9f0..c417387 100644
--- a/examples/rtnl/rtnl-route-event.c
+++ b/examples/rtnl/rtnl-route-event.c
@@ -6,7 +6,7 @@ 
 #include <time.h>
 #include <arpa/inet.h>
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <linux/if.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h
index 0331da7..471b468 100644
--- a/include/libmnl/libmnl.h
+++ b/include/libmnl/libmnl.h
@@ -6,7 +6,7 @@ 
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/socket.h> /* for sa_family_t */
-#include <linux/netlink.h>
+#include "linux/netlink.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index ced0e1a..80f3fad 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -1,7 +1,7 @@ 
 #ifndef __LINUX_NETLINK_H
 #define __LINUX_NETLINK_H
 
-#include <linux/socket.h> /* for __kernel_sa_family_t */
+#include "linux/socket.h" /* for __kernel_sa_family_t */
 #include <linux/types.h>
 
 #define NETLINK_ROUTE		0	/* Routing/device hook				*/
diff --git a/src/attr.c b/src/attr.c
index 0359ba9..ad83461 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -7,7 +7,7 @@ 
  * (at your option) any later version.
  */
 #include <limits.h>	/* for INT_MAX */
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <string.h>
 #include <errno.h>
 #include "internal.h"
diff --git a/src/callback.c b/src/callback.c
index 01181e6..b17edf6 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -8,7 +8,7 @@ 
  */
 
 #include <errno.h>
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include "internal.h"
 
 static int mnl_cb_noop(const struct nlmsghdr *nlh, void *data)
diff --git a/src/nlmsg.c b/src/nlmsg.c
index f9448a5..673259f 100644
--- a/src/nlmsg.c
+++ b/src/nlmsg.c
@@ -12,7 +12,7 @@ 
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include "internal.h"
 
 /**
diff --git a/src/socket.c b/src/socket.c
index 31d6fbe..fea234a 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -7,7 +7,7 @@ 
  * (at your option) any later version.
  */
 
-#include <libmnl/libmnl.h>
+#include "libmnl/libmnl.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdlib.h>