Sys -> user includes.

eclipse · Apr 29, 2015 · b598aec · b598aec
1 parent 970ba58
commit b598aec
Show file tree

Hide file tree

Showing 41 changed files with 210 additions and 284 deletions.
diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c
@@ -18,9 +18,9 @@ and the Eclipse Distribution License is available at
 #include <stdio.h>
 #include <string.h>
 
-#include <mosquitto_internal.h>
-#include <mosquitto.h>
-#include <memory_mosq.h>
+#include "mosquitto_internal.h"
+#include "mosquitto.h"
+#include "memory_mosq.h"
 
 int mosquitto__log_printf(struct mosquitto *mosq, int priority, const char *fmt, ...)
 {

diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h
@@ -16,7 +16,7 @@ and the Eclipse Distribution License is available at
 #ifndef _LOGGING_MOSQ_H_
 #define _LOGGING_MOSQ_H_
 
-#include <mosquitto.h>
+#include "mosquitto.h"
 
 int mosquitto__log_printf(struct mosquitto *mosq, int priority, const char *fmt, ...);
 

diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c
@@ -14,12 +14,12 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <memory_mosq.h>
+#include "memory_mosq.h"
 
 #ifdef REAL_WITH_MEMORY_TRACKING
 # if defined(__APPLE__)

diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c
@@ -18,12 +18,12 @@ and the Eclipse Distribution License is available at
 #include <stdlib.h>
 #include <string.h>
 
-#include <mosquitto_internal.h>
-#include <mosquitto.h>
-#include <memory_mosq.h>
-#include <messages_mosq.h>
-#include <send_mosq.h>
-#include <time_mosq.h>
+#include "mosquitto_internal.h"
+#include "mosquitto.h"
+#include "memory_mosq.h"
+#include "messages_mosq.h"
+#include "send_mosq.h"
+#include "time_mosq.h"
 
 void mosquitto__message_cleanup(struct mosquitto_message_all **message)
 {

diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h
@@ -16,8 +16,8 @@ and the Eclipse Distribution License is available at
 #ifndef _MESSAGES_MOSQ_H_
 #define _MESSAGES_MOSQ_H_
 
-#include <mosquitto_internal.h>
-#include <mosquitto.h>
+#include "mosquitto_internal.h"
+#include "mosquitto.h"
 
 void mosquitto__message_cleanup_all(struct mosquitto *mosq);
 void mosquitto__message_cleanup(struct mosquitto_message_all **message);

diff --git a/lib/mosquitto.c b/lib/mosquitto.c
@@ -29,21 +29,21 @@ and the Eclipse Distribution License is available at
 typedef int ssize_t;
 #endif
 
-#include <mosquitto.h>
-#include <mosquitto_internal.h>
-#include <logging_mosq.h>
-#include <messages_mosq.h>
-#include <memory_mosq.h>
-#include <mqtt3_protocol.h>
-#include <net_mosq.h>
-#include <packet_mosq.h>
-#include <read_handle.h>
-#include <send_mosq.h>
-#include <socks_mosq.h>
-#include <time_mosq.h>
-#include <tls_mosq.h>
-#include <util_mosq.h>
-#include <will_mosq.h>
+#include "mosquitto.h"
+#include "mosquitto_internal.h"
+#include "logging_mosq.h"
+#include "messages_mosq.h"
+#include "memory_mosq.h"
+#include "mqtt3_protocol.h"
+#include "net_mosq.h"
+#include "packet_mosq.h"
+#include "read_handle.h"
+#include "send_mosq.h"
+#include "socks_mosq.h"
+#include "time_mosq.h"
+#include "tls_mosq.h"
+#include "util_mosq.h"
+#include "will_mosq.h"
 
 #if !defined(WIN32) && !defined(__SYMBIAN32__)
 #define HAVE_PSELECT

diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
@@ -17,7 +17,7 @@ and the Eclipse Distribution License is available at
 #ifndef _MOSQUITTO_INTERNAL_H_
 #define _MOSQUITTO_INTERNAL_H_
 
-#include <config.h>
+#include "config.h"
 
 #ifdef WIN32
 # include <winsock2.h>

diff --git a/lib/net_mosq.c b/lib/net_mosq.c
@@ -58,28 +58,20 @@ and the Eclipse Distribution License is available at
 #endif
 
 #ifdef WITH_BROKER
-# include <mosquitto_broker.h>
-# ifdef WITH_SYS_TREE
- extern uint64_t g_bytes_received;
- extern uint64_t g_bytes_sent;
- extern unsigned long g_msgs_received;
- extern unsigned long g_msgs_sent;
- extern unsigned long g_pub_msgs_received;
- extern unsigned long g_pub_msgs_sent;
-# endif
+# include "mosquitto_broker.h"
 # ifdef WITH_WEBSOCKETS
 # include <libwebsockets.h>
 # endif
 #else
-# include <read_handle.h>
+# include "read_handle.h"
 #endif
 
-#include <logging_mosq.h>
-#include <memory_mosq.h>
-#include <mqtt3_protocol.h>
-#include <net_mosq.h>
-#include <time_mosq.h>
-#include <util_mosq.h>
+#include "logging_mosq.h"
+#include "memory_mosq.h"
+#include "mqtt3_protocol.h"
+#include "net_mosq.h"
+#include "time_mosq.h"
+#include "util_mosq.h"
 
 
 #ifdef WITH_TLS

diff --git a/lib/net_mosq.h b/lib/net_mosq.h
@@ -23,8 +23,8 @@ and the Eclipse Distribution License is available at
 typedef int ssize_t;
 #endif
 
-#include <mosquitto_internal.h>
-#include <mosquitto.h>
+#include "mosquitto_internal.h"
+#include "mosquitto.h"
 
 #ifdef WITH_BROKER
 struct mosquitto_db;

diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
@@ -14,76 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#if 0
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#ifndef WIN32
-#include <netdb.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-#ifdef __ANDROID__
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <sys/endian.h>
-#endif
-
-#ifdef __FreeBSD__
-# include <netinet/in.h>
-#endif
-
-#ifdef __SYMBIAN32__
-#include <netinet/in.h>
-#endif
-
-#ifdef __QNX__
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG 0
-#endif
-#include <net/netbyte.h>
-#include <netinet/in.h>
-#endif
-
-#ifdef WITH_TLS
-#include <openssl/conf.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <tls_mosq.h>
-#endif
-
-#ifdef WITH_BROKER
-# include <mosquitto_broker.h>
-# ifdef WITH_SYS_TREE
- extern uint64_t g_bytes_received;
- extern uint64_t g_bytes_sent;
- extern unsigned long g_msgs_received;
- extern unsigned long g_msgs_sent;
- extern unsigned long g_pub_msgs_received;
- extern unsigned long g_pub_msgs_sent;
-# endif
-# ifdef WITH_WEBSOCKETS
-# include <libwebsockets.h>
-# endif
-#else
-# include <read_handle.h>
-#endif
-
-#include <logging_mosq.h>
-#include <time_mosq.h>
-#include <util_mosq.h>
-#endif
-
 #include <assert.h>
 #include <errno.h>
 
 #ifdef WITH_BROKER
-# include <mosquitto_broker.h>
+# include "mosquitto_broker.h"
 # ifdef WITH_SYS_TREE
  extern uint64_t g_bytes_received;
  extern uint64_t g_bytes_sent;
@@ -96,10 +31,9 @@ and the Eclipse Distribution License is available at
 # include <libwebsockets.h>
 # endif
 #else
-# include <read_handle.h>
+# include "read_handle.h"
 #endif
 
-
 #include "memory_mosq.h"
 #include "mqtt3_protocol.h"
 #include "net_mosq.h"

diff --git a/lib/packet_mosq.h b/lib/packet_mosq.h
@@ -16,8 +16,8 @@ and the Eclipse Distribution License is available at
 #ifndef _PACKET_MOSQ_H_
 #define _PACKET_MOSQ_H_
 
-#include <mosquitto_internal.h>
-#include <mosquitto.h>
+#include "mosquitto_internal.h"
+#include "mosquitto.h"
 
 #ifdef WITH_BROKER
 struct mosquitto_db;

diff --git a/lib/read_handle.c b/lib/read_handle.c
@@ -18,17 +18,17 @@ and the Eclipse Distribution License is available at
 #include <stdio.h>
 #include <string.h>
 
-#include <mosquitto.h>
-#include <logging_mosq.h>
-#include <memory_mosq.h>
-#include <messages_mosq.h>
-#include <mqtt3_protocol.h>
-#include <net_mosq.h>
-#include <packet_mosq.h>
-#include <read_handle.h>
-#include <send_mosq.h>
-#include <time_mosq.h>
-#include <util_mosq.h>
+#include "mosquitto.h"
+#include "logging_mosq.h"
+#include "memory_mosq.h"
+#include "messages_mosq.h"
+#include "mqtt3_protocol.h"
+#include "net_mosq.h"
+#include "packet_mosq.h"
+#include "read_handle.h"
+#include "send_mosq.h"
+#include "time_mosq.h"
+#include "util_mosq.h"
 
 int mosquitto__packet_handle(struct mosquitto *mosq)
 {

diff --git a/lib/read_handle.h b/lib/read_handle.h
@@ -16,7 +16,7 @@ and the Eclipse Distribution License is available at
 #ifndef _READ_HANDLE_H_
 #define _READ_HANDLE_H_
 
-#include <mosquitto.h>
+#include "mosquitto.h"
 struct mosquitto_db;
 
 int mosquitto__packet_handle(struct mosquitto *mosq);

diff --git a/lib/read_handle_client.c b/lib/read_handle_client.c
@@ -16,12 +16,12 @@ and the Eclipse Distribution License is available at
 
 #include <assert.h>
 
-#include <mosquitto.h>
-#include <logging_mosq.h>
-#include <memory_mosq.h>
-#include <net_mosq.h>
-#include <packet_mosq.h>
-#include <read_handle.h>
+#include "mosquitto.h"
+#include "logging_mosq.h"
+#include "memory_mosq.h"
+#include "net_mosq.h"
+#include "packet_mosq.h"
+#include "read_handle.h"
 
 int mosquitto__handle_connack(struct mosquitto *mosq)
 {

diff --git a/lib/read_handle_shared.c b/lib/read_handle_shared.c
@@ -18,18 +18,18 @@ and the Eclipse Distribution License is available at
 #include <stdio.h>
 #include <string.h>
 
-#include <mosquitto.h>
-#include <logging_mosq.h>
-#include <memory_mosq.h>
-#include <messages_mosq.h>
-#include <mqtt3_protocol.h>
-#include <net_mosq.h>
-#include <packet_mosq.h>
-#include <read_handle.h>
-#include <send_mosq.h>
-#include <util_mosq.h>
+#include "mosquitto.h"
+#include "logging_mosq.h"
+#include "memory_mosq.h"
+#include "messages_mosq.h"
+#include "mqtt3_protocol.h"
+#include "net_mosq.h"
+#include "packet_mosq.h"
+#include "read_handle.h"
+#include "send_mosq.h"
+#include "util_mosq.h"
 #ifdef WITH_BROKER
-#include <mosquitto_broker.h>
+#include "mosquitto_broker.h"
 #endif
 
 int mosquitto__handle_pingreq(struct mosquitto *mosq)

diff --git a/lib/send_client_mosq.c b/lib/send_client_mosq.c
@@ -17,17 +17,17 @@ and the Eclipse Distribution License is available at
 #include <assert.h>
 #include <string.h>
 
-#include <mosquitto.h>
-#include <logging_mosq.h>
-#include <memory_mosq.h>
-#include <mqtt3_protocol.h>
-#include <net_mosq.h>
-#include <packet_mosq.h>
-#include <send_mosq.h>
-#include <util_mosq.h>
+#include "mosquitto.h"
+#include "logging_mosq.h"
+#include "memory_mosq.h"
+#include "mqtt3_protocol.h"
+#include "net_mosq.h"
+#include "packet_mosq.h"
+#include "send_mosq.h"
+#include "util_mosq.h"
 
 #ifdef WITH_BROKER
-#include <mosquitto_broker.h>
+#include "mosquitto_broker.h"
 #endif
 
 int mosquitto__send_connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session)