This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new f2589bb DISPATCH-836 Standardize #include order (#1105)
f2589bb is described below
commit f2589bb3577de4b02693ac3f32022504d92562fc
Author: Jiri Daněk <[email protected]>
AuthorDate: Mon Apr 5 22:48:49 2021 +0200
DISPATCH-836 Standardize #include order (#1105)
---
.clang-format | 42 ++++++++++++++++++++
include/qpid/dispatch.h | 36 ++++++++---------
include/qpid/dispatch/address_lookup_server.h | 6 +--
include/qpid/dispatch/alloc.h | 4 +-
include/qpid/dispatch/alloc_pool.h | 7 ++--
include/qpid/dispatch/atomic.h | 2 +-
include/qpid/dispatch/buffer.h | 4 +-
include/qpid/dispatch/compose.h | 4 +-
include/qpid/dispatch/connection_manager.h | 4 +-
include/qpid/dispatch/container.h | 9 +++--
include/qpid/dispatch/ctools.h | 4 +-
include/qpid/dispatch/dispatch.h | 3 +-
include/qpid/dispatch/enum.h | 2 +-
include/qpid/dispatch/error.h | 3 +-
include/qpid/dispatch/failoverlist.h | 2 +-
include/qpid/dispatch/hash.h | 5 ++-
include/qpid/dispatch/http1_codec.h | 4 +-
include/qpid/dispatch/iterator.h | 6 +--
include/qpid/dispatch/log.h | 2 +-
include/qpid/dispatch/message.h | 15 +++----
include/qpid/dispatch/parse.h | 4 +-
include/qpid/dispatch/protocol_adaptor.h | 7 ++--
include/qpid/dispatch/python_embedded.h | 12 +++---
include/qpid/dispatch/router.h | 9 +++--
include/qpid/dispatch/router_core.h | 13 +++---
include/qpid/dispatch/server.h | 5 ++-
include/qpid/dispatch/timer.h | 5 ++-
include/qpid/dispatch/trace_mask.h | 6 +--
router/src/main.c | 24 +++++------
src/adaptors/adaptor_utils.c | 1 +
src/adaptors/adaptor_utils.h | 3 +-
src/adaptors/http1/http1_adaptor.c | 3 +-
src/adaptors/http1/http1_client.c | 3 +-
src/adaptors/http1/http1_codec.c | 13 +++---
src/adaptors/http1/http1_private.h | 7 ++--
src/adaptors/http1/http1_request_info.c | 6 ++-
src/adaptors/http1/http1_server.c | 2 +-
src/adaptors/http2/http2_adaptor.c | 19 +++++----
src/adaptors/http2/http2_adaptor.h | 24 +++++------
src/adaptors/http_common.h | 10 ++---
src/adaptors/reference_adaptor.c | 8 ++--
src/adaptors/tcp_adaptor.c | 14 ++++---
src/adaptors/tcp_adaptor.h | 21 +++++-----
src/address_lookup_utils.c | 6 +--
src/alloc_pool.c | 22 +++++++----
src/amqp.c | 3 +-
src/aprintf.h | 4 +-
src/bitmask.c | 6 ++-
src/buffer.c | 5 ++-
src/compose.c | 12 ++++--
src/compose_private.h | 3 +-
src/connection_manager.c | 26 ++++++------
src/connection_manager_private.h | 2 +-
src/container.c | 32 ++++++++-------
src/delivery_state.c | 6 +--
src/discriminator.c | 3 +-
src/dispatch.c | 27 +++++++------
src/dispatch_private.h | 9 +++--
src/entity.c | 8 ++--
src/entity.h | 3 +-
src/entity_cache.c | 16 ++++----
src/error.c | 19 +++++----
src/failoverlist.c | 8 ++--
src/hash.c | 6 +--
src/http-libwebsockets.c | 21 +++++-----
src/http-none.c | 3 +-
src/iterator.c | 13 +++---
src/log.c | 23 ++++++-----
src/log_private.h | 3 +-
src/message.c | 33 +++++++++-------
src/message_private.h | 8 ++--
src/parse.c | 13 +++---
src/parse_tree.c | 11 +++---
src/parse_tree.h | 6 +--
src/platform.c | 14 +++----
src/policy.c | 20 ++++++----
src/policy.h | 15 +++----
src/posix/threading.c | 12 +++---
src/proton_utils.c | 11 +++---
src/python_embedded.c | 16 ++++----
src/python_private.h | 4 +-
src/remote_sasl.c | 5 ++-
src/router_agent.c | 16 ++++----
src/router_config.c | 10 +++--
src/router_core/agent.c | 21 +++++-----
src/router_core/agent_address.c | 1 +
src/router_core/agent_config_address.c | 4 +-
src/router_core/agent_config_auto_link.c | 5 ++-
src/router_core/agent_config_link_route.c | 5 ++-
src/router_core/agent_conn_link_route.c | 3 +-
src/router_core/agent_connection.c | 4 +-
src/router_core/agent_link.c | 1 +
src/router_core/agent_router.c | 1 +
src/router_core/connections.c | 19 ++++-----
src/router_core/core_client_api.c | 3 +-
src/router_core/core_link_endpoint.c | 7 +++-
src/router_core/core_timer.c | 6 ++-
src/router_core/delivery.c | 1 +
src/router_core/error.c | 1 +
src/router_core/exchange_bindings.c | 12 +++---
src/router_core/exchange_bindings.h | 3 ++
src/router_core/forwarder.c | 12 +++---
src/router_core/management_agent.c | 22 ++++++-----
.../modules/address_lookup_client/lookup_client.c | 14 ++++---
.../address_lookup_server/address_lookup_server.c | 9 +++--
.../edge_addr_tracking/edge_addr_tracking.c | 8 ++--
src/router_core/modules/edge_router/addr_proxy.c | 7 +++-
.../modules/edge_router/connection_manager.c | 4 +-
src/router_core/modules/edge_router/edge_mgmt.c | 3 +-
.../modules/edge_router/link_route_proxy.c | 1 +
src/router_core/modules/edge_router/module.c | 3 +-
src/router_core/modules/mobile_sync/mobile.c | 18 +++++----
.../streaming_link_scrubber.c | 4 +-
.../stuck_delivery_detection/delivery_tracker.c | 8 ++--
.../modules/test_hooks/core_test_hooks.c | 12 +++---
src/router_core/route_control.c | 5 ++-
src/router_core/route_tables.c | 3 +-
src/router_core/router_core.c | 7 ++--
src/router_core/router_core_private.h | 15 +++----
src/router_core/router_core_thread.c | 7 ++--
src/router_core/terminus.c | 3 +-
src/router_core/transfer.c | 11 +++---
src/router_node.c | 24 ++++++-----
src/router_private.h | 19 ++++-----
src/router_pynode.c | 19 +++++----
src/server.c | 46 +++++++++++-----------
src/server_private.h | 23 +++++------
src/timer.c | 12 ++++--
src/timer_private.h | 6 +--
src/trace_mask.c | 11 +++---
tests/alloc_test.c | 4 +-
tests/buffer_test.c | 6 ++-
tests/c_unittests/test_amqp.cpp | 2 +-
tests/c_unittests/test_terminus.cpp | 3 +-
tests/clogger.c | 37 +++++++++--------
tests/compose_test.c | 13 +++---
tests/core_timer_test.c | 3 +-
tests/failoverlist_test.c | 14 ++++---
tests/field_test.c | 8 ++--
tests/hash_test.c | 9 +++--
tests/message_test.c | 13 +++---
tests/parse_test.c | 12 +++---
tests/parse_tree_tests.c | 4 +-
tests/policy_test.c | 8 ++--
tests/proton_utils_tests.c | 13 +++---
tests/run_unit_tests.c | 7 ++--
tests/run_unit_tests_size.c | 4 +-
tests/test-receiver.c | 27 ++++++-------
tests/test-sender.c | 31 +++++++--------
tests/thread_test.c | 12 +++---
tests/timer_test.c | 14 ++++---
tests/tool_test.c | 8 ++--
152 files changed, 889 insertions(+), 662 deletions(-)
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..e4f3a94
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,42 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+BasedOnStyle: Google
+IndentWidth: 4
+ColumnLimit: 120
+BreakBeforeBraces: Linux
+AllowShortFunctionsOnASingleLine: None
+SpaceAfterCStyleCast: true
+AlignConsecutiveAssignments: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+IncludeCategories:
+ # python-related headers must go first
+ - Regex: '^<Python.h>|"qpid/dispatch/python_embedded.h"|"python_private.h"$'
+ Priority: -1
+ - Regex: '^"qpid/dispatch/?.*\.h"'
+ Priority: 2
+ - Regex: '^[<"]proton/.*\.h[>"]'
+ Priority: 3
+ - Regex: '^<.*\.h>'
+ Priority: 4
+ - Regex: '^<.*'
+ Priority: 5
+ - Regex: '.*'
+ Priority: 1
diff --git a/include/qpid/dispatch.h b/include/qpid/dispatch.h
index 603f8b4..531b03c 100644
--- a/include/qpid/dispatch.h
+++ b/include/qpid/dispatch.h
@@ -39,23 +39,23 @@
* provides the tools to do so.
*/
-#include <qpid/dispatch/bitmask.h>
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/timer.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/message.h>
-#include <qpid/dispatch/container.h>
-#include <qpid/dispatch/connection_manager.h>
-#include <qpid/dispatch/dispatch.h>
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/bitmask.h"
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/connection_manager.h"
+#include "qpid/dispatch/container.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/parse.h"
+#include "qpid/dispatch/router.h"
+#include "qpid/dispatch/router_core.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/threading.h"
+#include "qpid/dispatch/timer.h"
#endif
diff --git a/include/qpid/dispatch/address_lookup_server.h
b/include/qpid/dispatch/address_lookup_server.h
index 33a6782..ca88953 100644
--- a/include/qpid/dispatch/address_lookup_server.h
+++ b/include/qpid/dispatch/address_lookup_server.h
@@ -19,9 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/container.h>
-#include <qpid/dispatch/compose.h>
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/container.h"
+#include "qpid/dispatch/iterator.h"
//
// API for building address lookup request messages. The message properties
// and body fields are handled separately so they can be passed directly to the
diff --git a/include/qpid/dispatch/alloc.h b/include/qpid/dispatch/alloc.h
index 7b77e02..972b1f0 100644
--- a/include/qpid/dispatch/alloc.h
+++ b/include/qpid/dispatch/alloc.h
@@ -20,13 +20,13 @@
*/
#include "config.h"
-#include <string.h>
+#include <string.h>
#if !defined(NDEBUG)
#define QD_MEMORY_DEBUG 1
// when debugging fill allocated/deallocated memory
-// to catch uinitialized access or use after free
+// to catch uninitialized access or use after free
#define QD_MEMORY_FREE 0x99
#define QD_MEMORY_INIT 0x11
#define QD_MEMORY_FILL(P,C,S) do { if (P) { memset((P),(C),(S)); } } while (0)
diff --git a/include/qpid/dispatch/alloc_pool.h
b/include/qpid/dispatch/alloc_pool.h
index d872ff4..a36a07c 100644
--- a/include/qpid/dispatch/alloc_pool.h
+++ b/include/qpid/dispatch/alloc_pool.h
@@ -19,10 +19,11 @@
* under the License.
*/
-#include <stdlib.h>
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/threading.h"
+
#include <stdint.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/ctools.h>
+#include <stdlib.h>
/**
* @file
diff --git a/include/qpid/dispatch/atomic.h b/include/qpid/dispatch/atomic.h
index db41b40..86754d5 100644
--- a/include/qpid/dispatch/atomic.h
+++ b/include/qpid/dispatch/atomic.h
@@ -147,7 +147,7 @@ static inline void sys_atomic_destroy(sys_atomic_t *ref) {}
/******************************************************************************
* Mutex fallback atomics *
******************************************************************************/
-#include <qpid/dispatch/threading.h>
+#include "qpid/dispatch/threading.h"
struct sys_atomic_t {
sys_mutex_t *lock;
diff --git a/include/qpid/dispatch/buffer.h b/include/qpid/dispatch/buffer.h
index e23f690..2398d55 100644
--- a/include/qpid/dispatch/buffer.h
+++ b/include/qpid/dispatch/buffer.h
@@ -26,8 +26,8 @@
* @{
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/atomic.h>
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
typedef struct qd_buffer_t qd_buffer_t;
diff --git a/include/qpid/dispatch/compose.h b/include/qpid/dispatch/compose.h
index 9abadae..95c99f0 100644
--- a/include/qpid/dispatch/compose.h
+++ b/include/qpid/dispatch/compose.h
@@ -19,8 +19,8 @@
* under the License.
*/
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/iterator.h>
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/iterator.h"
/** A linked list of buffers composing a sequence of AMQP data objects. */
typedef struct qd_composed_field_t qd_composed_field_t;
diff --git a/include/qpid/dispatch/connection_manager.h
b/include/qpid/dispatch/connection_manager.h
index b7e290e..79fb881 100644
--- a/include/qpid/dispatch/connection_manager.h
+++ b/include/qpid/dispatch/connection_manager.h
@@ -23,8 +23,8 @@
* Manage listeners and connectors.
*/
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/server.h>
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/server.h"
typedef struct qd_connection_manager_t qd_connection_manager_t;
typedef struct qd_config_ssl_profile_t qd_config_ssl_profile_t;
diff --git a/include/qpid/dispatch/container.h
b/include/qpid/dispatch/container.h
index 82d9ad8..5d186ff 100644
--- a/include/qpid/dispatch/container.h
+++ b/include/qpid/dispatch/container.h
@@ -29,12 +29,13 @@
* @{
*/
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/server.h"
+
#include <proton/engine.h>
#include <proton/version.h>
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/alloc.h>
typedef uint8_t qd_dist_mode_t;
#define QD_DIST_COPY 0x01
diff --git a/include/qpid/dispatch/ctools.h b/include/qpid/dispatch/ctools.h
index 3dbb39d..d3569c9 100644
--- a/include/qpid/dispatch/ctools.h
+++ b/include/qpid/dispatch/ctools.h
@@ -23,11 +23,11 @@
* Double-ended queues and other useful macros.
*/
-#include <stdlib.h>
#include <assert.h>
#include <memory.h>
-#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#define CT_ASSERT(exp) { assert(exp); }
diff --git a/include/qpid/dispatch/dispatch.h b/include/qpid/dispatch/dispatch.h
index 3b8f79e..6d9337d 100644
--- a/include/qpid/dispatch/dispatch.h
+++ b/include/qpid/dispatch/dispatch.h
@@ -19,8 +19,9 @@
* under the License.
*/
+#include "qpid/dispatch/error.h"
+
#include <stdbool.h>
-#include <qpid/dispatch/error.h>
/**@file
* Configure and prepare a dispatch instance.
diff --git a/include/qpid/dispatch/enum.h b/include/qpid/dispatch/enum.h
index a562711..67f1e39 100644
--- a/include/qpid/dispatch/enum.h
+++ b/include/qpid/dispatch/enum.h
@@ -19,7 +19,7 @@
* under the License.
*/
-#include <qpid/dispatch/static_assert.h>
+#include "qpid/dispatch/static_assert.h"
/**@file
*
diff --git a/include/qpid/dispatch/error.h b/include/qpid/dispatch/error.h
index f464e58..41d50e0 100644
--- a/include/qpid/dispatch/error.h
+++ b/include/qpid/dispatch/error.h
@@ -19,7 +19,8 @@
* under the License.
*/
-#include <qpid/dispatch/enum.h>
+#include "qpid/dispatch/enum.h"
+
#include <stdarg.h>
/** @file
diff --git a/include/qpid/dispatch/failoverlist.h
b/include/qpid/dispatch/failoverlist.h
index 369066a..0a0526a 100644
--- a/include/qpid/dispatch/failoverlist.h
+++ b/include/qpid/dispatch/failoverlist.h
@@ -1,6 +1,6 @@
#ifndef __failoverlist_h__
#define __failoverlist_h__ 1
-#include <qpid/dispatch/ctools.h>
+#include "qpid/dispatch/ctools.h"
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/include/qpid/dispatch/hash.h b/include/qpid/dispatch/hash.h
index b9761c1..cacd2a8 100644
--- a/include/qpid/dispatch/hash.h
+++ b/include/qpid/dispatch/hash.h
@@ -23,9 +23,10 @@
* Hash table.
*/
+#include "qpid/dispatch/error.h"
+#include "qpid/dispatch/iterator.h"
+
#include <stdlib.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/error.h>
#define HASH_INIT ((uint32_t) 5381)
#define HASH_COMPUTE(HASH, OCTET) ((((HASH)<<5) + (HASH)) + (uint32_t)(OCTET))
// hash * 33 + octet
diff --git a/include/qpid/dispatch/http1_codec.h
b/include/qpid/dispatch/http1_codec.h
index 48c987b..e8567c6 100644
--- a/include/qpid/dispatch/http1_codec.h
+++ b/include/qpid/dispatch/http1_codec.h
@@ -19,8 +19,8 @@
* under the License.
*
*/
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/message.h>
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/message.h"
#include <inttypes.h>
#include <stdbool.h>
diff --git a/include/qpid/dispatch/iterator.h b/include/qpid/dispatch/iterator.h
index 343573c..9a1a3f8 100644
--- a/include/qpid/dispatch/iterator.h
+++ b/include/qpid/dispatch/iterator.h
@@ -19,10 +19,10 @@
* under the License.
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <qpid/dispatch/buffer.h>
+#include "qpid/dispatch/buffer.h"
+#include <stdbool.h>
+#include <stdint.h>
/**@file
* Iterate over message buffer chains and address fields.
diff --git a/include/qpid/dispatch/log.h b/include/qpid/dispatch/log.h
index c781c9f..6265029 100644
--- a/include/qpid/dispatch/log.h
+++ b/include/qpid/dispatch/log.h
@@ -18,8 +18,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <stdbool.h>
#include <stdarg.h>
+#include <stdbool.h>
/**@file
* Sending debug/administrative log messages.
diff --git a/include/qpid/dispatch/message.h b/include/qpid/dispatch/message.h
index a580701..82c62cf 100644
--- a/include/qpid/dispatch/message.h
+++ b/include/qpid/dispatch/message.h
@@ -19,13 +19,14 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/container.h>
-#include <qpid/dispatch/log.h>
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/container.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/parse.h"
+
#include <proton/raw_connection.h>
/**@file
diff --git a/include/qpid/dispatch/parse.h b/include/qpid/dispatch/parse.h
index f6e5fd7..d47a312 100644
--- a/include/qpid/dispatch/parse.h
+++ b/include/qpid/dispatch/parse.h
@@ -19,8 +19,8 @@
* under the License.
*/
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/iterator.h>
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/iterator.h"
/**@file
* Parse raw data fields into AMQP data trees.
diff --git a/include/qpid/dispatch/protocol_adaptor.h
b/include/qpid/dispatch/protocol_adaptor.h
index 2f8fa8c..dda7665 100644
--- a/include/qpid/dispatch/protocol_adaptor.h
+++ b/include/qpid/dispatch/protocol_adaptor.h
@@ -19,10 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/policy_spec.h>
-#include <qpid/dispatch/delivery_state.h>
-
+#include "qpid/dispatch/delivery_state.h"
+#include "qpid/dispatch/policy_spec.h"
+#include "qpid/dispatch/router_core.h"
typedef struct qdr_protocol_adaptor_t qdr_protocol_adaptor_t;
typedef struct qdr_connection_t qdr_connection_t;
diff --git a/include/qpid/dispatch/python_embedded.h
b/include/qpid/dispatch/python_embedded.h
index c690fa1..86e6dc6 100644
--- a/include/qpid/dispatch/python_embedded.h
+++ b/include/qpid/dispatch/python_embedded.h
@@ -24,12 +24,14 @@
*/
#include <Python.h>
+
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/error.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/parse.h"
+
#include <proton/codec.h>
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/error.h>
/**
* Initialize the embedded-python subsystem. This must be called before
diff --git a/include/qpid/dispatch/router.h b/include/qpid/dispatch/router.h
index c74258a..2feaa75 100644
--- a/include/qpid/dispatch/router.h
+++ b/include/qpid/dispatch/router.h
@@ -27,9 +27,10 @@
* Register addresses, send messages.
* @{
*/
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/message.h>
-#include <qpid/dispatch/iterator.h>
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/message.h"
+
#include <stdbool.h>
typedef struct qdr_core_t qdr_core_t;
@@ -46,7 +47,7 @@ typedef enum {
QD_TREATMENT_UNAVAILABLE = 5
} qd_address_treatment_t;
-#include <qpid/dispatch/router_core.h>
+#include "qpid/dispatch/router_core.h"
/** Message forwarding descriptor
*
diff --git a/include/qpid/dispatch/router_core.h
b/include/qpid/dispatch/router_core.h
index be687d1..4bb5279 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -19,13 +19,12 @@
* under the License.
*/
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/bitmask.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/policy_spec.h>
-
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/bitmask.h"
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/parse.h"
+#include "qpid/dispatch/policy_spec.h"
+#include "qpid/dispatch/router.h"
/**
* All callbacks in this module shall be invoked on a connection thread from
the server thread pool.
diff --git a/include/qpid/dispatch/server.h b/include/qpid/dispatch/server.h
index 092c4de..faf8366 100644
--- a/include/qpid/dispatch/server.h
+++ b/include/qpid/dispatch/server.h
@@ -19,8 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/failoverlist.h>
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/failoverlist.h"
+
#include <proton/engine.h>
#include <proton/event.h>
#include <proton/ssl.h>
diff --git a/include/qpid/dispatch/timer.h b/include/qpid/dispatch/timer.h
index d477011..e9c9511 100644
--- a/include/qpid/dispatch/timer.h
+++ b/include/qpid/dispatch/timer.h
@@ -19,8 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/server.h>
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/server.h"
+
#include <stdint.h>
/**@file
diff --git a/include/qpid/dispatch/trace_mask.h
b/include/qpid/dispatch/trace_mask.h
index b92569f..7863c85 100644
--- a/include/qpid/dispatch/trace_mask.h
+++ b/include/qpid/dispatch/trace_mask.h
@@ -19,9 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/bitmask.h>
+#include "qpid/dispatch/bitmask.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/parse.h"
typedef struct qd_tracemask_t qd_tracemask_t;
diff --git a/router/src/main.c b/router/src/main.c
index fa41f95..f67a791 100644
--- a/router/src/main.c
+++ b/router/src/main.c
@@ -17,20 +17,22 @@
* under the License.
*/
-#include <stdio.h>
-#include <qpid/dispatch.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <pwd.h>
+#include "config.h"
+
+#include "qpid/dispatch.h"
+
+#include <errno.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
#include <getopt.h>
-#include <errno.h>
#include <limits.h>
-#include "config.h"
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
static int exit_with_sigint = 0;
static qd_dispatch_t *dispatch = 0;
diff --git a/src/adaptors/adaptor_utils.c b/src/adaptors/adaptor_utils.c
index 562f488..71f4199 100644
--- a/src/adaptors/adaptor_utils.c
+++ b/src/adaptors/adaptor_utils.c
@@ -20,6 +20,7 @@
#include "adaptor_utils.h"
#include <proton/netaddr.h>
+
#include <string.h>
diff --git a/src/adaptors/adaptor_utils.h b/src/adaptors/adaptor_utils.h
index eb1bed0..58f7cd6 100644
--- a/src/adaptors/adaptor_utils.h
+++ b/src/adaptors/adaptor_utils.h
@@ -19,7 +19,8 @@
* under the License.
*/
-#include <qpid/dispatch/buffer.h>
+#include "qpid/dispatch/buffer.h"
+
#include <proton/raw_connection.h>
// Get the raw connections remote address
diff --git a/src/adaptors/http1/http1_adaptor.c
b/src/adaptors/http1/http1_adaptor.c
index 9e4eeb6..8536131 100644
--- a/src/adaptors/http1/http1_adaptor.c
+++ b/src/adaptors/http1/http1_adaptor.c
@@ -19,9 +19,8 @@
#include "http1_private.h"
-#include <stdio.h>
#include <inttypes.h>
-
+#include <stdio.h>
//
// This file contains code for the HTTP/1.x protocol adaptor. This file
diff --git a/src/adaptors/http1/http1_client.c
b/src/adaptors/http1/http1_client.c
index 422dd6a..565da12 100644
--- a/src/adaptors/http1/http1_client.c
+++ b/src/adaptors/http1/http1_client.c
@@ -18,8 +18,9 @@
*/
#include "python_private.h"
-#include "http1_private.h"
+
#include "adaptors/adaptor_utils.h"
+#include "http1_private.h"
#include <proton/listener.h>
#include <proton/proactor.h>
diff --git a/src/adaptors/http1/http1_codec.c b/src/adaptors/http1/http1_codec.c
index a11f226..79760c4 100644
--- a/src/adaptors/http1/http1_codec.c
+++ b/src/adaptors/http1/http1_codec.c
@@ -18,18 +18,17 @@
*
*/
-#include <qpid/dispatch/http1_codec.h>
+#include "qpid/dispatch/http1_codec.h"
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/alloc_pool.h>
-#include <qpid/dispatch/discriminator.h>
+#include "qpid/dispatch/alloc_pool.h"
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/discriminator.h"
+#include "qpid/dispatch/iterator.h"
+#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
-
//
// This file contains code for encoding/decoding an HTTP/1.x data stream. See
diff --git a/src/adaptors/http1/http1_private.h
b/src/adaptors/http1/http1_private.h
index 5ecf4fd..f654fc5 100644
--- a/src/adaptors/http1/http1_private.h
+++ b/src/adaptors/http1/http1_private.h
@@ -29,11 +29,12 @@
// "out": for information flowing from the router out to the endpoint
// (from core to proactor)
//
-#include <qpid/dispatch/http1_codec.h>
-#include <qpid/dispatch/protocol_adaptor.h>
-#include <qpid/dispatch/message.h>
#include "adaptors/http_common.h"
+#include "qpid/dispatch/http1_codec.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+
// for debug: will dump I/O buffer content to stdout if true
#define HTTP1_DUMP_BUFFERS false
diff --git a/src/adaptors/http1/http1_request_info.c
b/src/adaptors/http1/http1_request_info.c
index 2ea239f..400e6a1 100644
--- a/src/adaptors/http1/http1_request_info.c
+++ b/src/adaptors/http1/http1_request_info.c
@@ -17,11 +17,13 @@
* under the License.
*/
+#include "dispatch_private.h"
#include "http1_private.h"
-#include <qpid/dispatch/server.h>
+
#include "qpid/dispatch/ctools.h"
#include "qpid/dispatch/protocol_adaptor.h"
-#include "dispatch_private.h"
+#include "qpid/dispatch/server.h"
+
#include <inttypes.h>
static void _http1_record_request_info(qdr_http1_adaptor_t *adaptor,
qdr_http1_request_base_t *request, const char *host, bool ingress)
diff --git a/src/adaptors/http1/http1_server.c
b/src/adaptors/http1/http1_server.c
index d22127a..fb7188f 100644
--- a/src/adaptors/http1/http1_server.c
+++ b/src/adaptors/http1/http1_server.c
@@ -17,8 +17,8 @@
* under the License.
*/
-#include "http1_private.h"
#include "adaptors/adaptor_utils.h"
+#include "http1_private.h"
#include <proton/proactor.h>
diff --git a/src/adaptors/http2/http2_adaptor.c
b/src/adaptors/http2/http2_adaptor.c
index fe9c95a..ed68974 100644
--- a/src/adaptors/http2/http2_adaptor.c
+++ b/src/adaptors/http2/http2_adaptor.c
@@ -18,22 +18,21 @@
*/
#include "http2_adaptor.h"
-#include <stdio.h>
-#include <inttypes.h>
-#include <pthread.h>
+#include "adaptors/http_common.h"
+
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/protocol_adaptor.h"
#include <proton/condition.h>
#include <proton/listener.h>
-#include <proton/proactor.h>
#include <proton/netaddr.h>
+#include <proton/proactor.h>
#include <proton/raw_connection.h>
-#include <nghttp2/nghttp2.h>
-
-#include <qpid/dispatch/buffer.h>
-
-#include <qpid/dispatch/protocol_adaptor.h>
-#include "adaptors/http_common.h"
+#include <inttypes.h>
+#include <nghttp2/nghttp2.h>
+#include <pthread.h>
+#include <stdio.h>
const char *PATH = ":path";
const char *METHOD = ":method";
diff --git a/src/adaptors/http2/http2_adaptor.h
b/src/adaptors/http2/http2_adaptor.h
index fc0a729..37e3e52 100644
--- a/src/adaptors/http2/http2_adaptor.h
+++ b/src/adaptors/http2/http2_adaptor.h
@@ -19,20 +19,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <time.h>
+#include "adaptors/http_common.h"
+#include "server_private.h"
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/log.h>
-#include <nghttp2/nghttp2.h>
-#include <qpid/dispatch/protocol_adaptor.h>
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/threading.h"
-#include "server_private.h"
-#include "adaptors/http_common.h"
+#include <nghttp2/nghttp2.h>
+#include <time.h>
size_t QD_HTTP2_BUFFER_SIZE = 16384;
size_t NUM_QD_BUFFERS_IN_ONE_HTTP2_BUFFER = 32;
diff --git a/src/adaptors/http_common.h b/src/adaptors/http_common.h
index 441e6cf..8ba8365 100644
--- a/src/adaptors/http_common.h
+++ b/src/adaptors/http_common.h
@@ -19,14 +19,14 @@
* under the License.
*/
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/timer.h>
-
#include "delivery.h"
#include "entity.h"
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/timer.h"
+
#define QD_HTTP_LOG_SOURCE "HTTP_ADAPTOR"
typedef enum {
diff --git a/src/adaptors/reference_adaptor.c b/src/adaptors/reference_adaptor.c
index 9982ad0..91e3fb6 100644
--- a/src/adaptors/reference_adaptor.c
+++ b/src/adaptors/reference_adaptor.c
@@ -17,13 +17,15 @@
* under the License.
*/
+#include "delivery.h"
+
#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/message.h"
#include "qpid/dispatch/protocol_adaptor.h"
-#include "delivery.h"
#include "qpid/dispatch/timer.h"
-#include "qpid/dispatch/message.h"
-#include <stdio.h>
+
#include <inttypes.h>
+#include <stdio.h>
static char *address1 = "examples";
static char *address2 = "stream";
diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 884d0a7..eb10f8a 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -18,17 +18,21 @@
*/
#include "tcp_adaptor.h"
+
+#include "delivery.h"
+
+#include "qpid/dispatch/alloc_pool.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+
#include <proton/condition.h>
#include <proton/listener.h>
#include <proton/netaddr.h>
#include <proton/proactor.h>
#include <proton/raw_connection.h>
-#include "qpid/dispatch/alloc_pool.h"
-#include "qpid/dispatch/ctools.h"
-#include "qpid/dispatch/protocol_adaptor.h"
-#include "delivery.h"
-#include <stdio.h>
+
#include <inttypes.h>
+#include <stdio.h>
ALLOC_DEFINE(qd_tcp_listener_t);
ALLOC_DEFINE(qd_tcp_connector_t);
diff --git a/src/adaptors/tcp_adaptor.h b/src/adaptors/tcp_adaptor.h
index 79aa340..87151c8 100644
--- a/src/adaptors/tcp_adaptor.h
+++ b/src/adaptors/tcp_adaptor.h
@@ -19,20 +19,21 @@
* under the License.
*/
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/enum.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/log.h>
+#include "dispatch_private.h"
+#include "timer_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/enum.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/threading.h"
+
#include <proton/engine.h>
#include <proton/event.h>
#include <proton/ssl.h>
-#include "dispatch_private.h"
-#include "timer_private.h"
-
typedef struct qd_tcp_listener_t qd_tcp_listener_t;
typedef struct qd_tcp_connector_t qd_tcp_connector_t;
typedef struct qd_bridge_config_t qd_bridge_config_t;
diff --git a/src/address_lookup_utils.c b/src/address_lookup_utils.c
index c7846d7..99d713a 100644
--- a/src/address_lookup_utils.c
+++ b/src/address_lookup_utils.c
@@ -21,9 +21,9 @@
// API for interacting with the core address lookup server
//
-#include <qpid/dispatch/address_lookup_server.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/parse.h>
+#include "qpid/dispatch/address_lookup_server.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/parse.h"
/* create the message application properties and body for the link route lookup
* request message
diff --git a/src/alloc_pool.c b/src/alloc_pool.c
index 79c14a2..2179f97 100644
--- a/src/alloc_pool.c
+++ b/src/alloc_pool.c
@@ -18,19 +18,25 @@
*/
#include <Python.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/log.h>
-#include <memory.h>
-#include <inttypes.h>
-#include <stdio.h>
+
+#include "qpid/dispatch/alloc_pool.h"
+
+#include "config.h"
#include "entity.h"
#include "entity_cache.h"
-#include "config.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/log.h"
+
+#include <inttypes.h>
+#include <memory.h>
+#include <stdio.h>
#ifdef QD_MEMORY_DEBUG
-#include <execinfo.h>
#include "log_private.h"
+
+#include <execinfo.h>
#endif
const char *QD_ALLOCATOR_TYPE = "allocator";
diff --git a/src/amqp.c b/src/amqp.c
index 8da6db2..4dee1f5 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -17,7 +17,8 @@
* under the License.
*/
-#include <qpid/dispatch/amqp.h>
+#include "qpid/dispatch/amqp.h"
+
#include <errno.h>
#include <netdb.h>
#include <stdlib.h>
diff --git a/src/aprintf.h b/src/aprintf.h
index b73f7ff..6ae2c82 100644
--- a/src/aprintf.h
+++ b/src/aprintf.h
@@ -19,10 +19,10 @@
* under the License.
*/
+#include <assert.h>
+#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
/**
Variadic appending printf - see aprintf()
diff --git a/src/bitmask.c b/src/bitmask.c
index a4492f5..6ec66cc 100644
--- a/src/bitmask.c
+++ b/src/bitmask.c
@@ -17,8 +17,10 @@
* under the License.
*/
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/bitmask.h>
+#include "qpid/dispatch/bitmask.h"
+
+#include "qpid/dispatch/alloc.h"
+
#include <assert.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/buffer.c b/src/buffer.c
index d3e788e..badd9c9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -17,8 +17,9 @@
* under the License.
*/
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/alloc.h>
+#include "qpid/dispatch/buffer.h"
+
+#include "qpid/dispatch/alloc.h"
#include <stdint.h>
#include <string.h>
diff --git a/src/compose.c b/src/compose.c
index 3495ed6..105abcd 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -17,11 +17,15 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/amqp.h>
+#include "qpid/dispatch/compose.h"
+
#include "compose_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/ctools.h"
+
#include <memory.h>
#include <string.h>
diff --git a/src/compose_private.h b/src/compose_private.h
index 01bb447..7295fbb 100644
--- a/src/compose_private.h
+++ b/src/compose_private.h
@@ -19,9 +19,10 @@
* under the License.
*/
-#include <qpid/dispatch/compose.h>
#include "message_private.h"
+#include "qpid/dispatch/compose.h"
+
qd_buffer_list_t *qd_compose_buffers(qd_composed_field_t *field);
typedef struct qd_composite_t {
diff --git a/src/connection_manager.c b/src/connection_manager.c
index 83613df..282a902 100644
--- a/src/connection_manager.c
+++ b/src/connection_manager.c
@@ -17,22 +17,26 @@
* under the License.
*/
-#include <qpid/dispatch/connection_manager.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/failoverlist.h>
-#include <proton/listener.h>
-#include "dispatch_private.h"
+#include "qpid/dispatch/connection_manager.h"
+
#include "connection_manager_private.h"
-#include "server_private.h"
+#include "dispatch_private.h"
#include "entity.h"
#include "entity_cache.h"
#include "schema_enum.h"
-#include <string.h>
-#include <stdio.h>
-#include <inttypes.h>
+#include "server_private.h"
+
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/failoverlist.h"
+#include "qpid/dispatch/threading.h"
+
+#include <proton/listener.h>
+
#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
struct qd_config_ssl_profile_t {
DEQ_LINKS(qd_config_ssl_profile_t);
diff --git a/src/connection_manager_private.h b/src/connection_manager_private.h
index cf5fc06..388e7f9 100644
--- a/src/connection_manager_private.h
+++ b/src/connection_manager_private.h
@@ -19,7 +19,7 @@
* under the License.
*/
-#include <qpid/dispatch/server.h>
+#include "qpid/dispatch/server.h"
/**
* @file
diff --git a/src/container.c b/src/container.c
index 2989633..b3fa7d4 100644
--- a/src/container.c
+++ b/src/container.c
@@ -17,24 +17,28 @@
* under the License.
*/
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qpid/dispatch/container.h"
+
#include "dispatch_private.h"
#include "policy.h"
-#include <qpid/dispatch/container.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/message.h>
-#include <proton/engine.h>
-#include <proton/message.h>
+
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/threading.h"
+
#include <proton/connection.h>
+#include <proton/engine.h>
#include <proton/event.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/log.h>
+#include <proton/message.h>
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
/** Instance of a node type in a container */
struct qd_node_t {
diff --git a/src/delivery_state.c b/src/delivery_state.c
index 819a29b..4404aee 100644
--- a/src/delivery_state.c
+++ b/src/delivery_state.c
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <qpid/dispatch/delivery_state.h>
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/alloc_pool.h>
+#include "qpid/dispatch/delivery_state.h"
+#include "qpid/dispatch/alloc_pool.h"
+#include "qpid/dispatch/router_core.h"
ALLOC_DECLARE(qd_delivery_state_t);
ALLOC_DEFINE(qd_delivery_state_t);
diff --git a/src/discriminator.c b/src/discriminator.c
index 1604d0f..f7406f9 100644
--- a/src/discriminator.c
+++ b/src/discriminator.c
@@ -17,7 +17,8 @@
* under the License.
*/
-#include <qpid/dispatch/discriminator.h>
+#include "qpid/dispatch/discriminator.h"
+
#include <stdlib.h>
void qd_generate_discriminator(char *string)
diff --git a/src/dispatch.c b/src/dispatch.c
index 7a79899..67b7cad 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -18,26 +18,29 @@
*/
#include "python_private.h"
-#include <qpid/dispatch/python_embedded.h>
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/static_assert.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/discriminator.h>
-#include <stdlib.h>
-#include <inttypes.h>
+#include "qpid/dispatch/python_embedded.h"
+
+#include "qpid/dispatch.h"
#include "config.h"
#include "dispatch_private.h"
+#include "entity.h"
+#include "entity_cache.h"
#include "http.h"
#include "log_private.h"
-#include "router_private.h"
#include "message_private.h"
#include "policy.h"
-#include "entity.h"
-#include "entity_cache.h"
+#include "router_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/discriminator.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/static_assert.h"
+
#include <dlfcn.h>
+#include <inttypes.h>
+#include <stdlib.h>
/**
* Private Function Prototypes
diff --git a/src/dispatch_private.h b/src/dispatch_private.h
index 440e633..21fcc61 100644
--- a/src/dispatch_private.h
+++ b/src/dispatch_private.h
@@ -33,12 +33,13 @@ typedef struct qd_router_conn_t qd_router_conn_t;
typedef struct qd_config_phase_t qd_config_phase_t;
typedef struct qd_config_address_t qd_config_address_t;
-#include <qpid/dispatch/container.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/connection_manager.h>
#include "policy.h"
-#include "server_private.h"
#include "router_private.h"
+#include "server_private.h"
+
+#include "qpid/dispatch/connection_manager.h"
+#include "qpid/dispatch/container.h"
+#include "qpid/dispatch/router.h"
struct qd_dispatch_t {
qd_server_t *server;
diff --git a/src/entity.c b/src/entity.c
index 1e77bfe..aecaabe 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -18,12 +18,14 @@
*/
#include "python_private.h" // must be first!
+#include "qpid/dispatch/python_embedded.h"
-#include <qpid/dispatch/error.h>
-#include <qpid/dispatch/python_embedded.h>
-#include "dispatch_private.h"
#include "entity.h"
+#include "dispatch_private.h"
+
+#include "qpid/dispatch/error.h"
+
struct qd_entity_t {
PyObject py_object; /* Any object supporting __set/get_item__, e.g.
dict. */
};
diff --git a/src/entity.h b/src/entity.h
index 46f6618..6b7140a 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -19,8 +19,9 @@
* under the License.
*/
+#include "qpid/dispatch/error.h"
+
#include <stdbool.h>
-#include <qpid/dispatch/error.h>
/**
* @defgroup entity-attributes Set/get cached attributes of a managed entity.
diff --git a/src/entity_cache.c b/src/entity_cache.c
index ae757be..f819221 100644
--- a/src/entity_cache.c
+++ b/src/entity_cache.c
@@ -17,18 +17,20 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/ctools.h>
-#include <structmember.h>
+#include "qpid/dispatch/python_embedded.h"
+
#include "entity_cache.h"
-#include "entity.h"
+
#include "dispatch_private.h"
+#include "entity.h"
#include "router_private.h"
-#include <stdbool.h>
-#include <pthread.h>
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/threading.h"
+#include <pthread.h>
+#include <stdbool.h>
+#include <structmember.h>
typedef enum { REMOVE=0, ADD=1 } action_t;
diff --git a/src/error.c b/src/error.c
index 4a7c815..beb4e43 100644
--- a/src/error.c
+++ b/src/error.c
@@ -17,17 +17,20 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h> // must be first!
+#include "python_private.h"
+#include "qpid/dispatch/python_embedded.h" // must be first!
+
+#include "qpid/dispatch/error.h"
+
+#include "aprintf.h"
+#include "log_private.h"
+
+#include "qpid/dispatch/enum.h"
+#include "qpid/dispatch/log.h"
-#include <qpid/dispatch/error.h>
-#include <qpid/dispatch/enum.h>
-#include <qpid/dispatch/log.h>
-#include <stdarg.h>
#include <errno.h>
+#include <stdarg.h>
#include <string.h>
-#include "log_private.h"
-#include "aprintf.h"
-#include "python_private.h"
// force the use of the non-gnu version of strerror_r
#undef _POSIX_C_SOURCE
diff --git a/src/failoverlist.c b/src/failoverlist.c
index e21ea6e..8ec32a9 100644
--- a/src/failoverlist.c
+++ b/src/failoverlist.c
@@ -17,9 +17,11 @@
* under the License.
*/
-#include <qpid/dispatch/failoverlist.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/error.h>
+#include "qpid/dispatch/failoverlist.h"
+
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/error.h"
+
#include <ctype.h>
#include <string.h>
diff --git a/src/hash.c b/src/hash.c
index aa1a3d4..6f42710 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -17,13 +17,13 @@
* under the License.
*/
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/ctools.h"
#include <stdio.h>
#include <string.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/ctools.h>
typedef struct qd_hash_item_t {
DEQ_LINKS(struct qd_hash_item_t);
diff --git a/src/http-libwebsockets.c b/src/http-libwebsockets.c
index 8487130..87b84cc 100644
--- a/src/http-libwebsockets.c
+++ b/src/http-libwebsockets.c
@@ -17,24 +17,23 @@
* under the License.
*/
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/protocol_adaptor.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/timer.h>
+#include "config.h"
+#include "http.h"
+#include "server_private.h"
-#include <proton/connection_driver.h>
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+#include "qpid/dispatch/threading.h"
+#include "qpid/dispatch/timer.h"
-#include <libwebsockets.h>
+#include <proton/connection_driver.h>
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
-
-#include "http.h"
-#include "server_private.h"
-#include "config.h"
+#include <libwebsockets.h>
static const char *CIPHER_LIST = "ALL:aNULL:!eNULL:@STRENGTH"; /* Default */
static const char *IGNORED = "ignore-this-log-message";
diff --git a/src/http-none.c b/src/http-none.c
index c50a683..15af50e 100644
--- a/src/http-none.c
+++ b/src/http-none.c
@@ -17,9 +17,10 @@
* under the License.
*/
-#include <qpid/dispatch/log.h>
#include "http.h"
+#include "qpid/dispatch/log.h"
+
struct qd_dispatch_t;
/* No HTTP implementation available. */
diff --git a/src/iterator.c b/src/iterator.c
index 427c8f1..1cc7520 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -17,12 +17,15 @@
* under the License.
*/
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/hash.h>
+#include "qpid/dispatch/iterator.h"
+
#include "message_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/hash.h"
+
#include <stdio.h>
#include <string.h>
diff --git a/src/log.c b/src/log.c
index 58c0b31..e06464a 100644
--- a/src/log.c
+++ b/src/log.c
@@ -17,19 +17,22 @@
* under the License.
*/
-#include "python_private.h" // must be first!
+#include "python_private.h" // must be first!
-#include "log_private.h"
-#include "server_private.h"
+#include "qpid/dispatch/log.h"
+
+#include "aprintf.h"
#include "entity.h"
#include "entity_cache.h"
-#include "aprintf.h"
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/log.h>
+#include "log_private.h"
+#include "server_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/threading.h"
+
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/log_private.h b/src/log_private.h
index a7abd22..80f51be 100644
--- a/src/log_private.h
+++ b/src/log_private.h
@@ -19,7 +19,8 @@
* under the License.
*/
-#include <qpid/dispatch/log.h>
+#include "qpid/dispatch/log.h"
+
#include <time.h>
void qd_log_initialize(void);
diff --git a/src/message.c b/src/message.c
index e9052bb..2ebcd50 100644
--- a/src/message.c
+++ b/src/message.c
@@ -17,26 +17,31 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/error.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/buffer.h>
-#include <proton/object.h>
-#include "message_private.h"
+#include "qpid/dispatch/message.h"
+
+#include "aprintf.h"
#include "compose_private.h"
#include "connection_manager_private.h"
-#include "aprintf.h"
+#include "message_private.h"
#include "policy.h"
-#include <string.h>
+
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/error.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/threading.h"
+
+#include <proton/object.h>
+
+#include <assert.h>
#include <ctype.h>
-#include <stdio.h>
+#include <inttypes.h>
#include <limits.h>
+#include <stdio.h>
+#include <string.h>
#include <time.h>
-#include <inttypes.h>
-#include <assert.h>
#define LOCK sys_mutex_lock
#define UNLOCK sys_mutex_unlock
diff --git a/src/message_private.h b/src/message_private.h
index c4262a9..ab2b69d 100644
--- a/src/message_private.h
+++ b/src/message_private.h
@@ -19,10 +19,10 @@
* under the License.
*/
-#include <qpid/dispatch/message.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/atomic.h>
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/threading.h"
typedef struct qd_message_pvt_t qd_message_pvt_t;
diff --git a/src/parse.c b/src/parse.c
index 0ee24b2..e529580 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -17,15 +17,16 @@
* under the License.
*/
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/amqp.h>
+#include "qpid/dispatch/parse.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/ctools.h"
-#include <stdio.h>
-#include <limits.h>
#include <assert.h>
#include <inttypes.h>
+#include <limits.h>
+#include <stdio.h>
DEQ_DECLARE(qd_parsed_field_t, qd_parsed_field_list_t);
diff --git a/src/parse_tree.c b/src/parse_tree.c
index 416f98b..1975c5e 100644
--- a/src/parse_tree.c
+++ b/src/parse_tree.c
@@ -17,15 +17,14 @@
* under the License.
*/
-
#include "parse_tree.h"
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/hash.h>
-#include <stdio.h>
-#include <inttypes.h>
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/log.h"
+#include <inttypes.h>
+#include <stdio.h>
// token parsing
// parse a string of tokens separated by a boundary character.
diff --git a/src/parse_tree.h b/src/parse_tree.h
index d33821f..fd283c7 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -19,10 +19,10 @@
* under the License.
*/
-#include <stdbool.h>
-#include <qpid/dispatch/error.h>
-#include <qpid/dispatch/iterator.h>
+#include "qpid/dispatch/error.h"
+#include "qpid/dispatch/iterator.h"
+#include <stdbool.h>
typedef struct qd_parse_tree qd_parse_tree_t;
diff --git a/src/platform.c b/src/platform.c
index b1cd61b..b8e4e70 100644
--- a/src/platform.c
+++ b/src/platform.c
@@ -17,17 +17,17 @@
* under the License.
*/
+#include "qpid/dispatch/platform.h"
+
#include "config.h"
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/resource.h>
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
#include <stdbool.h>
-
-#include <qpid/dispatch/platform.h>
-#include <qpid/dispatch/ctools.h>
-
+#include <stdio.h>
+#include <sys/resource.h>
+#include <sys/time.h>
uintmax_t qd_platform_memory_size(void)
{
diff --git a/src/policy.c b/src/policy.c
index 42697b6..c86bd3a 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -17,24 +17,28 @@
* under the License.
*/
+#include "python_private.h"
#include "qpid/dispatch/python_embedded.h"
+
#include "policy.h"
-#include "policy_internal.h"
-#include "parse_tree.h"
-#include <stdio.h>
-#include <string.h>
+
#include "dispatch_private.h"
+#include "parse_tree.h"
+#include "policy_internal.h"
+
#include "qpid/dispatch/container.h"
#include "qpid/dispatch/server.h"
-#include <proton/message.h>
+
#include <proton/condition.h>
#include <proton/connection.h>
-#include <proton/transport.h>
#include <proton/error.h>
#include <proton/event.h>
-#include <inttypes.h>
-#include "python_private.h"
+#include <proton/message.h>
+#include <proton/transport.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
//
// The current statistics maintained globally through multiple
diff --git a/src/policy.h b/src/policy.h
index f05c0d9..8b8cfe3 100644
--- a/src/policy.h
+++ b/src/policy.h
@@ -19,18 +19,19 @@
* under the License.
*/
+#include "config.h"
+#include "entity.h"
+#include "entity_cache.h"
+#include "parse_tree.h"
+
#include "qpid/dispatch.h"
-#include "qpid/dispatch/server.h"
-#include "qpid/dispatch/ctools.h"
-#include "qpid/dispatch/static_assert.h"
#include "qpid/dispatch/alloc.h"
#include "qpid/dispatch/alloc_pool.h"
+#include "qpid/dispatch/ctools.h"
#include "qpid/dispatch/policy_spec.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/static_assert.h"
-#include "config.h"
-#include "entity.h"
-#include "entity_cache.h"
-#include "parse_tree.h"
#include <dlfcn.h>
typedef struct qd_policy_denial_counts_s qd_policy_denial_counts_t;
diff --git a/src/posix/threading.c b/src/posix/threading.c
index ec9f416..0e0a794 100644
--- a/src/posix/threading.c
+++ b/src/posix/threading.c
@@ -23,12 +23,14 @@
//
#undef NDEBUG
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/ctools.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <pthread.h>
+#include "qpid/dispatch/threading.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <assert.h>
+#include <pthread.h>
+#include <stdint.h>
+#include <stdio.h>
struct sys_mutex_t {
pthread_mutex_t mutex;
diff --git a/src/proton_utils.c b/src/proton_utils.c
index 81b06ca..8051e70 100644
--- a/src/proton_utils.c
+++ b/src/proton_utils.c
@@ -17,13 +17,14 @@
* under the License.
*/
-#include <qpid/dispatch/proton_utils.h>
-#include <string.h>
-#include <inttypes.h>
-#include <time.h>
+#include "qpid/dispatch/proton_utils.h"
+
+#include <assert.h>
#include <ctype.h>
+#include <inttypes.h>
#include <stdio.h>
-#include <assert.h>
+#include <string.h>
+#include <time.h>
char *qdpn_data_as_string(pn_data_t *data)
{
diff --git a/src/python_embedded.c b/src/python_embedded.c
index 03eac07..08e4d5c 100644
--- a/src/python_embedded.c
+++ b/src/python_embedded.c
@@ -17,17 +17,17 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
#include "python_private.h"
+#include "qpid/dispatch/python_embedded.h"
#include "entity_cache.h"
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/error.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/error.h>
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/error.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/router.h"
+#include "qpid/dispatch/threading.h"
#include <ctype.h>
diff --git a/src/python_private.h b/src/python_private.h
index 6cf7d28..66fdfaf 100644
--- a/src/python_private.h
+++ b/src/python_private.h
@@ -19,8 +19,10 @@
* under the License.
*/
#include <Python.h>
+
+#include "qpid/dispatch/message.h"
+
#include <stdint.h>
-#include <qpid/dispatch/message.h>
#if PY_MAJOR_VERSION <= 2
// deal with the two integer types in Python2
diff --git a/src/remote_sasl.c b/src/remote_sasl.c
index 624ee91..5561acb 100644
--- a/src/remote_sasl.c
+++ b/src/remote_sasl.c
@@ -20,6 +20,7 @@
*/
#include "remote_sasl.h"
+
#include "server_private.h"
#include <stdio.h>
@@ -41,8 +42,8 @@
#define pnx_sasl_set_failed(X) pnx_sasl_fail_authentication(X)
#define remote_sasl_process_outcome(X, Y) remote_sasl_process_outcome(X)
#endif
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/ctools.h>
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/log.h"
static qd_log_source_t* auth_service_log;
diff --git a/src/router_agent.c b/src/router_agent.c
index 4e02b77..8a060ee 100644
--- a/src/router_agent.c
+++ b/src/router_agent.c
@@ -17,16 +17,18 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <qpid/dispatch.h>
+#include "qpid/dispatch/python_embedded.h"
+
#include "dispatch_private.h"
-#include "router_private.h"
#include "entity_cache.h"
+#include "router_private.h"
+
+#include "qpid/dispatch.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
const char *QD_ROUTER_TYPE = "router";
diff --git a/src/router_config.c b/src/router_config.c
index 2471b14..3a935bc 100644
--- a/src/router_config.c
+++ b/src/router_config.c
@@ -17,15 +17,17 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/log.h>
+#include "qpid/dispatch/python_embedded.h"
+
#include "dispatch_private.h"
-#include "router_private.h"
#include "entity.h"
#include "entity_cache.h"
+#include "router_private.h"
#include "schema_enum.h"
+#include "qpid/dispatch.h"
+#include "qpid/dispatch/log.h"
+
static void qdi_router_configure_body(qdr_core_t *core,
qd_composed_field_t *body,
qd_router_entity_type_t type,
diff --git a/src/router_core/agent.c b/src/router_core/agent.c
index 8ef8272..c8f9dbb 100644
--- a/src/router_core/agent.c
+++ b/src/router_core/agent.c
@@ -17,21 +17,22 @@
* under the License.
*/
-#include <qpid/dispatch/amqp.h>
+#include "adaptors/http1/http1_private.h"
+#include "adaptors/tcp_adaptor.h"
+#include "agent_address.h"
#include "agent_config_address.h"
-#include "agent_config_link_route.h"
#include "agent_config_auto_link.h"
-#include "agent_address.h"
-#include "agent_link.h"
+#include "agent_config_link_route.h"
+#include "agent_conn_link_route.h"
#include "agent_connection.h"
-#include "router_core_private.h"
-#include "exchange_bindings.h"
-#include <stdio.h>
+#include "agent_link.h"
#include "agent_router.h"
-#include "agent_conn_link_route.h"
-#include "adaptors/tcp_adaptor.h"
-#include "adaptors/http1/http1_private.h"
+#include "exchange_bindings.h"
+#include "router_core_private.h"
+#include "qpid/dispatch/amqp.h"
+
+#include <stdio.h>
static void qdr_manage_read_CT(qdr_core_t *core, qdr_action_t *action, bool
discard);
static void qdr_manage_create_CT(qdr_core_t *core, qdr_action_t *action, bool
discard);
diff --git a/src/router_core/agent_address.c b/src/router_core/agent_address.c
index 22d5cc1..0dbfa0d 100644
--- a/src/router_core/agent_address.c
+++ b/src/router_core/agent_address.c
@@ -18,6 +18,7 @@
*/
#include "agent_address.h"
+
#include "router_core_private.h"
#define QDR_ADDRESS_NAME 0
diff --git a/src/router_core/agent_config_address.c
b/src/router_core/agent_config_address.c
index 27e213c..238eadc 100644
--- a/src/router_core/agent_config_address.c
+++ b/src/router_core/agent_config_address.c
@@ -17,8 +17,10 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
#include "agent_config_address.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/agent_config_auto_link.c
b/src/router_core/agent_config_auto_link.c
index 0b42aab..8fba9a8 100644
--- a/src/router_core/agent_config_auto_link.c
+++ b/src/router_core/agent_config_auto_link.c
@@ -17,9 +17,12 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
#include "agent_config_auto_link.h"
+
#include "route_control.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/agent_config_link_route.c
b/src/router_core/agent_config_link_route.c
index a427194..aa3fafd 100644
--- a/src/router_core/agent_config_link_route.c
+++ b/src/router_core/agent_config_link_route.c
@@ -17,10 +17,13 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
#include "agent_config_link_route.h"
+
#include "agent_config_address.h"
#include "route_control.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/agent_conn_link_route.c
b/src/router_core/agent_conn_link_route.c
index 7e8b0d3..b84de89 100644
--- a/src/router_core/agent_conn_link_route.c
+++ b/src/router_core/agent_conn_link_route.c
@@ -18,12 +18,13 @@
*/
#include "agent_conn_link_route.h"
+
#include "agent_config_address.h"
#include "agent_config_link_route.h"
#include "route_control.h"
-#include <stdio.h>
#include <inttypes.h>
+#include <stdio.h>
const char *qdr_conn_link_route_columns[QDR_CONN_LINK_ROUTE_COLUMN_COUNT + 1] =
{"name",
diff --git a/src/router_core/agent_connection.c
b/src/router_core/agent_connection.c
index b8cfa7b..713603f 100644
--- a/src/router_core/agent_connection.c
+++ b/src/router_core/agent_connection.c
@@ -17,8 +17,10 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
#include "agent_connection.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/agent_link.c b/src/router_core/agent_link.c
index 24452f4..01296a7 100644
--- a/src/router_core/agent_link.c
+++ b/src/router_core/agent_link.c
@@ -18,6 +18,7 @@
*/
#include "agent_link.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/agent_router.c b/src/router_core/agent_router.c
index 7d83eac..9632e37 100644
--- a/src/router_core/agent_router.c
+++ b/src/router_core/agent_router.c
@@ -20,6 +20,7 @@
#include "agent_router.h"
#include "config.h"
+
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index 782eda6..2e80769 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -17,18 +17,19 @@
* under the License.
*/
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/discriminator.h>
-#include <qpid/dispatch/static_assert.h>
-#include "route_control.h"
-#include <qpid/dispatch/amqp.h>
-#include <stdio.h>
-#include <strings.h>
-#include <inttypes.h>
-#include "router_core_private.h"
#include "core_link_endpoint.h"
#include "delivery.h"
+#include "route_control.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/discriminator.h"
+#include "qpid/dispatch/router_core.h"
+#include "qpid/dispatch/static_assert.h"
+#include <inttypes.h>
+#include <stdio.h>
+#include <strings.h>
static void qdr_connection_opened_CT(qdr_core_t *core, qdr_action_t *action,
bool discard);
static void qdr_connection_closed_CT(qdr_core_t *core, qdr_action_t *action,
bool discard);
diff --git a/src/router_core/core_client_api.c
b/src/router_core/core_client_api.c
index d2801e8..39067de 100644
--- a/src/router_core/core_client_api.c
+++ b/src/router_core/core_client_api.c
@@ -18,11 +18,12 @@
*/
#include "core_client_api.h"
+
#include "core_link_endpoint.h"
#include "delivery.h"
-#include <inttypes.h>
#include <errno.h>
+#include <inttypes.h>
#include <stdio.h>
#include <time.h>
diff --git a/src/router_core/core_link_endpoint.c
b/src/router_core/core_link_endpoint.c
index 7dac0bf..5ac7276 100644
--- a/src/router_core/core_link_endpoint.c
+++ b/src/router_core/core_link_endpoint.c
@@ -18,10 +18,13 @@
*/
#include "core_link_endpoint.h"
-#include "qpid/dispatch/alloc.h"
+
#include "delivery.h"
-#include <stdio.h>
+
+#include "qpid/dispatch/alloc.h"
+
#include <inttypes.h>
+#include <stdio.h>
struct qdrc_endpoint_t {
qdrc_endpoint_desc_t *desc;
diff --git a/src/router_core/core_timer.c b/src/router_core/core_timer.c
index 7766488..fb39792 100644
--- a/src/router_core/core_timer.c
+++ b/src/router_core/core_timer.c
@@ -17,10 +17,12 @@
* under the License.
*/
-#include <stdio.h>
-#include <qpid/dispatch/ctools.h>
#include "router_core_private.h"
+#include "qpid/dispatch/ctools.h"
+
+#include <stdio.h>
+
ALLOC_DEFINE(qdr_core_timer_t);
void qdr_process_tick_CT(qdr_core_t *core, qdr_action_t *action, bool discard);
diff --git a/src/router_core/delivery.c b/src/router_core/delivery.c
index 9421581..830c64f 100644
--- a/src/router_core/delivery.c
+++ b/src/router_core/delivery.c
@@ -18,6 +18,7 @@
*/
#include "delivery.h"
+
#include <inttypes.h>
ALLOC_DEFINE(qdr_delivery_t);
diff --git a/src/router_core/error.c b/src/router_core/error.c
index ff906d4..6b22caa 100644
--- a/src/router_core/error.c
+++ b/src/router_core/error.c
@@ -18,6 +18,7 @@
*/
#include "router_core_private.h"
+
#include <stdio.h>
diff --git a/src/router_core/exchange_bindings.c
b/src/router_core/exchange_bindings.c
index 5bf1bbb..a1d4d7f 100644
--- a/src/router_core/exchange_bindings.c
+++ b/src/router_core/exchange_bindings.c
@@ -16,14 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include "router_core_private.h"
-#include "forwarder.h"
#include "exchange_bindings.h"
+
#include "delivery.h"
+#include "forwarder.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/ctools.h"
+#include <inttypes.h>
+#include <stdio.h>
// next_hop_t
// Describes the destination of a forwarded message
diff --git a/src/router_core/exchange_bindings.h
b/src/router_core/exchange_bindings.h
index ef802af..b4ba365 100644
--- a/src/router_core/exchange_bindings.h
+++ b/src/router_core/exchange_bindings.h
@@ -19,6 +19,9 @@
* under the License.
*/
+#include "router_core_private.h"
+
+#include "qpid/dispatch/router.h"
#define QDR_CONFIG_EXCHANGE_COLUMN_COUNT 12
#define QDR_CONFIG_BINDING_COLUMN_COUNT 7
diff --git a/src/router_core/forwarder.c b/src/router_core/forwarder.c
index 166916c..3e4b669 100644
--- a/src/router_core/forwarder.c
+++ b/src/router_core/forwarder.c
@@ -17,14 +17,16 @@
* under the License.
*/
-#include "router_core_private.h"
-#include <qpid/dispatch/amqp.h>
-#include <stdio.h>
-#include <strings.h>
#include "forwarder.h"
+
#include "delivery.h"
-#include <inttypes.h>
+#include "router_core_private.h"
+
+#include "qpid/dispatch/amqp.h"
+#include <inttypes.h>
+#include <stdio.h>
+#include <strings.h>
typedef struct qdr_forward_deliver_info_t {
DEQ_LINKS(struct qdr_forward_deliver_info_t);
diff --git a/src/router_core/management_agent.c
b/src/router_core/management_agent.c
index 09905c0..98d4a47 100644
--- a/src/router_core/management_agent.c
+++ b/src/router_core/management_agent.c
@@ -17,17 +17,19 @@
* under the License.
*/
-#include <stdio.h>
-#include <qpid/dispatch/parse.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/dispatch.h>
-#include <qpid/dispatch/alloc.h>
-#include "router_core_private.h"
-#include "dispatch_private.h"
#include "agent_link.h"
+#include "dispatch_private.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/dispatch.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/parse.h"
+#include "qpid/dispatch/router.h"
+#include "qpid/dispatch/router_core.h"
+
+#include <stdio.h>
const char *ENTITY = "entityType";
const char *TYPE = "type";
diff --git a/src/router_core/modules/address_lookup_client/lookup_client.c
b/src/router_core/modules/address_lookup_client/lookup_client.c
index 2c954b3..4030e8b 100644
--- a/src/router_core/modules/address_lookup_client/lookup_client.c
+++ b/src/router_core/modules/address_lookup_client/lookup_client.c
@@ -17,14 +17,16 @@
* under the License.
*/
-#include "module.h"
#include "core_attach_address_lookup.h"
-#include "router_core_private.h"
-#include "core_events.h"
#include "core_client_api.h"
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/discriminator.h>
-#include <qpid/dispatch/address_lookup_server.h>
+#include "core_events.h"
+#include "module.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/address_lookup_server.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/discriminator.h"
+
#include <stdio.h>
static uint64_t on_reply(qdr_core_t *core,
diff --git
a/src/router_core/modules/address_lookup_server/address_lookup_server.c
b/src/router_core/modules/address_lookup_server/address_lookup_server.c
index f466647..40f93bf 100644
--- a/src/router_core/modules/address_lookup_server/address_lookup_server.c
+++ b/src/router_core/modules/address_lookup_server/address_lookup_server.c
@@ -17,13 +17,14 @@
* under the License.
*/
-#include <qpid/dispatch/address_lookup_server.h>
-#include <qpid/dispatch/ctools.h>
-#include "module.h"
+#include "qpid/dispatch/address_lookup_server.h"
+
#include "core_link_endpoint.h"
+#include "module.h"
-#include "inttypes.h"
+#include "qpid/dispatch/ctools.h"
+#include <inttypes.h>
#define CREDIT_WINDOW 32
diff --git a/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
b/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
index 1120c2c..56fad32 100644
--- a/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
+++ b/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
@@ -17,10 +17,12 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/amqp.h>
-#include "module.h"
#include "core_link_endpoint.h"
+#include "module.h"
+
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/ctools.h"
+
#include <stdio.h>
typedef struct qdr_addr_tracking_module_context_t
qdr_addr_tracking_module_context_t;
diff --git a/src/router_core/modules/edge_router/addr_proxy.c
b/src/router_core/modules/edge_router/addr_proxy.c
index cd42128..0e76626 100644
--- a/src/router_core/modules/edge_router/addr_proxy.c
+++ b/src/router_core/modules/edge_router/addr_proxy.c
@@ -18,15 +18,18 @@
*/
#include "addr_proxy.h"
+
#include "core_events.h"
#include "core_link_endpoint.h"
#include "router_core_private.h"
+
#include "qpid/dispatch/amqp.h"
-#include "qpid/dispatch/message.h"
#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/message.h"
#include "qpid/dispatch/parse.h"
-#include <stdio.h>
+
#include <inttypes.h>
+#include <stdio.h>
//
// This is the Address Proxy component of the Edge Router module.
diff --git a/src/router_core/modules/edge_router/connection_manager.c
b/src/router_core/modules/edge_router/connection_manager.c
index 76cfd6c..7f40335 100644
--- a/src/router_core/modules/edge_router/connection_manager.c
+++ b/src/router_core/modules/edge_router/connection_manager.c
@@ -18,10 +18,12 @@
*/
#include "connection_manager.h"
+
#include "core_events.h"
#include "router_core_private.h"
-#include <stdio.h>
+
#include <inttypes.h>
+#include <stdio.h>
//
// This is the Connection Manager component of the Edge Router module.
diff --git a/src/router_core/modules/edge_router/edge_mgmt.c
b/src/router_core/modules/edge_router/edge_mgmt.c
index edeba96..7276ca0 100644
--- a/src/router_core/modules/edge_router/edge_mgmt.c
+++ b/src/router_core/modules/edge_router/edge_mgmt.c
@@ -18,11 +18,12 @@
*/
#include "edge_mgmt.h"
+
#include "core_client_api.h"
#include "link_route_proxy.h"
-#include <inttypes.h>
#include <errno.h>
+#include <inttypes.h>
/*
* an API that lets the core issue management requests
diff --git a/src/router_core/modules/edge_router/link_route_proxy.c
b/src/router_core/modules/edge_router/link_route_proxy.c
index d21d23d..64f9e01 100644
--- a/src/router_core/modules/edge_router/link_route_proxy.c
+++ b/src/router_core/modules/edge_router/link_route_proxy.c
@@ -18,6 +18,7 @@
*/
#include "link_route_proxy.h"
+
#include "agent_conn_link_route.h"
#include "edge_mgmt.h"
diff --git a/src/router_core/modules/edge_router/module.c
b/src/router_core/modules/edge_router/module.c
index dad4c99..a113b14 100644
--- a/src/router_core/modules/edge_router/module.c
+++ b/src/router_core/modules/edge_router/module.c
@@ -18,8 +18,9 @@
*/
#include "module.h"
-#include "connection_manager.h"
+
#include "addr_proxy.h"
+#include "connection_manager.h"
#include "edge_mgmt.h"
#include "link_route_proxy.h"
diff --git a/src/router_core/modules/mobile_sync/mobile.c
b/src/router_core/modules/mobile_sync/mobile.c
index b4a7a92..d216c3d 100644
--- a/src/router_core/modules/mobile_sync/mobile.c
+++ b/src/router_core/modules/mobile_sync/mobile.c
@@ -17,17 +17,19 @@
* under the License.
*/
-#include "module.h"
-#include "router_core_private.h"
#include "core_events.h"
+#include "module.h"
#include "route_control.h"
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/compose.h>
-#include <qpid/dispatch/message.h>
-#include <qpid/dispatch/router.h>
-#include <stdio.h>
+#include "router_core_private.h"
+
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/router.h"
+
#include <inttypes.h>
+#include <stdio.h>
#define PROTOCOL_VERSION 1
static const char *OPCODE = "opcode";
diff --git
a/src/router_core/modules/streaming_link_scrubber/streaming_link_scrubber.c
b/src/router_core/modules/streaming_link_scrubber/streaming_link_scrubber.c
index 126a09b..4818e84 100644
--- a/src/router_core/modules/streaming_link_scrubber/streaming_link_scrubber.c
+++ b/src/router_core/modules/streaming_link_scrubber/streaming_link_scrubber.c
@@ -17,8 +17,10 @@
* under the License.
*/
-#include "qpid/dispatch/ctools.h"
#include "module.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
diff --git
a/src/router_core/modules/stuck_delivery_detection/delivery_tracker.c
b/src/router_core/modules/stuck_delivery_detection/delivery_tracker.c
index 0c86803..a46f7b5 100644
--- a/src/router_core/modules/stuck_delivery_detection/delivery_tracker.c
+++ b/src/router_core/modules/stuck_delivery_detection/delivery_tracker.c
@@ -17,11 +17,13 @@
* under the License.
*/
-#include "qpid/dispatch/ctools.h"
-#include "module.h"
#include "delivery.h"
-#include <stdio.h>
+#include "module.h"
+
+#include "qpid/dispatch/ctools.h"
+
#include <inttypes.h>
+#include <stdio.h>
#define PROD_TIMER_INTERVAL 30
#define PROD_STUCK_AGE 10
diff --git a/src/router_core/modules/test_hooks/core_test_hooks.c
b/src/router_core/modules/test_hooks/core_test_hooks.c
index a810d35..850e1dd 100644
--- a/src/router_core/modules/test_hooks/core_test_hooks.c
+++ b/src/router_core/modules/test_hooks/core_test_hooks.c
@@ -19,14 +19,16 @@
#undef NDEBUG // test code - uses asserts
-#include "qpid/dispatch/ctools.h"
-#include "qpid/dispatch/message.h"
-#include "qpid/dispatch/compose.h"
-#include "core_link_endpoint.h"
#include "core_client_api.h"
+#include "core_link_endpoint.h"
#include "module.h"
-#include <stdio.h>
+
+#include "qpid/dispatch/compose.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/message.h"
+
#include <inttypes.h>
+#include <stdio.h>
typedef enum {
TEST_NODE_ECHO,
diff --git a/src/router_core/route_control.c b/src/router_core/route_control.c
index 1ae5338..58b0114 100644
--- a/src/router_core/route_control.c
+++ b/src/router_core/route_control.c
@@ -18,10 +18,13 @@
*/
#include "route_control.h"
+
#include "router_core_private.h"
+
+#include "qpid/dispatch/iterator.h"
+
#include <inttypes.h>
#include <stdio.h>
-#include <qpid/dispatch/iterator.h>
ALLOC_DEFINE(qdr_link_route_t);
ALLOC_DEFINE(qdr_auto_link_t);
diff --git a/src/router_core/route_tables.c b/src/router_core/route_tables.c
index 3388507..7282828 100644
--- a/src/router_core/route_tables.c
+++ b/src/router_core/route_tables.c
@@ -17,8 +17,9 @@
* under the License.
*/
-#include "router_core_private.h"
#include "route_control.h"
+#include "router_core_private.h"
+
#include <stdio.h>
static void qdr_add_router_CT (qdr_core_t *core, qdr_action_t
*action, bool discard);
diff --git a/src/router_core/router_core.c b/src/router_core/router_core.c
index 9540be0..3f391e0 100644
--- a/src/router_core/router_core.c
+++ b/src/router_core/router_core.c
@@ -17,11 +17,12 @@
* under the License.
*/
-#include "router_core_private.h"
-#include "route_control.h"
-#include "exchange_bindings.h"
#include "core_events.h"
#include "delivery.h"
+#include "exchange_bindings.h"
+#include "route_control.h"
+#include "router_core_private.h"
+
#include <stdio.h>
#include <strings.h>
diff --git a/src/router_core/router_core_private.h
b/src/router_core/router_core_private.h
index a735327..28f5140 100644
--- a/src/router_core/router_core_private.h
+++ b/src/router_core/router_core_private.h
@@ -21,10 +21,12 @@
#include "dispatch_private.h"
#include "message_private.h"
-#include <qpid/dispatch/protocol_adaptor.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/log.h>
+
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+#include "qpid/dispatch/threading.h"
+
#include <memory.h>
typedef struct qdr_address_t qdr_address_t;
@@ -54,10 +56,9 @@ ALLOC_DECLARE(qdr_connection_ref_t);
ALLOC_DECLARE(qdr_connection_t);
ALLOC_DECLARE(qdr_link_t);
-
-#include "core_link_endpoint.h"
-#include "core_events.h"
#include "core_attach_address_lookup.h"
+#include "core_events.h"
+#include "core_link_endpoint.h"
qdr_forwarder_t *qdr_forwarder_CT(qdr_core_t *core, qd_address_treatment_t
treatment);
int qdr_forward_message_CT(qdr_core_t *core, qdr_address_t *addr, qd_message_t
*msg, qdr_delivery_t *in_delivery,
diff --git a/src/router_core/router_core_thread.c
b/src/router_core/router_core_thread.c
index 9f8b17f..d997a2a 100644
--- a/src/router_core/router_core_thread.c
+++ b/src/router_core/router_core_thread.c
@@ -17,10 +17,11 @@
* under the License.
*/
-#include "router_core_private.h"
-#include "module.h"
-#include <qpid/dispatch/protocol_adaptor.h>
#include "dispatch_private.h"
+#include "module.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/protocol_adaptor.h"
/**
* Creates a thread that is dedicated to managing and using the routing table.
diff --git a/src/router_core/terminus.c b/src/router_core/terminus.c
index 921baf8..0bfe7b4 100644
--- a/src/router_core/terminus.c
+++ b/src/router_core/terminus.c
@@ -19,8 +19,9 @@
#include "router_core_private.h"
#include "terminus_private.h"
-#include <strings.h>
+
#include <inttypes.h>
+#include <strings.h>
ALLOC_DEFINE(qdr_terminus_t);
diff --git a/src/router_core/transfer.c b/src/router_core/transfer.c
index 290490c..e4c66ce 100644
--- a/src/router_core/transfer.c
+++ b/src/router_core/transfer.c
@@ -17,13 +17,14 @@
* under the License.
*/
-#include "router_core_private.h"
-#include "exchange_bindings.h"
#include "delivery.h"
-#include <qpid/dispatch/amqp.h>
-#include <stdio.h>
-#include <inttypes.h>
+#include "exchange_bindings.h"
+#include "router_core_private.h"
+
+#include "qpid/dispatch/amqp.h"
+#include <inttypes.h>
+#include <stdio.h>
//==================================================================================
// Internal Functions
diff --git a/src/router_node.c b/src/router_node.c
index bccf6cf..ab0d442 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -17,21 +17,25 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <qpid/dispatch.h>
+#include "qpid/dispatch/python_embedded.h"
+
+#include "delivery.h"
#include "dispatch_private.h"
#include "entity_cache.h"
-#include "router_private.h"
-#include "delivery.h"
#include "policy.h"
-#include <qpid/dispatch/protocol_adaptor.h>
-#include <qpid/dispatch/proton_utils.h>
+#include "router_private.h"
+
+#include "qpid/dispatch.h"
+#include "qpid/dispatch/protocol_adaptor.h"
+#include "qpid/dispatch/proton_utils.h"
+
#include <proton/sasl.h>
+
#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
const char *QD_ROUTER_NODE_TYPE = "router.node";
const char *QD_ROUTER_ADDRESS_TYPE = "router.address";
diff --git a/src/router_private.h b/src/router_private.h
index 6b7347a..33a0479 100644
--- a/src/router_private.h
+++ b/src/router_private.h
@@ -24,17 +24,18 @@
*@internal
*/
-#include <qpid/dispatch/enum.h>
-#include <qpid/dispatch/router.h>
-#include <qpid/dispatch/router_core.h>
-#include <qpid/dispatch/message.h>
-#include <qpid/dispatch/bitmask.h>
-#include <qpid/dispatch/trace_mask.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/log.h>
-#include "parse_tree.h"
#include "dispatch_private.h"
#include "entity.h"
+#include "parse_tree.h"
+
+#include "qpid/dispatch/bitmask.h"
+#include "qpid/dispatch/enum.h"
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/message.h"
+#include "qpid/dispatch/router.h"
+#include "qpid/dispatch/router_core.h"
+#include "qpid/dispatch/trace_mask.h"
qd_error_t qd_router_python_setup(qd_router_t *router);
void qd_router_python_free(qd_router_t *router);
diff --git a/src/router_pynode.c b/src/router_pynode.c
index 200e297..78bc939 100644
--- a/src/router_pynode.c
+++ b/src/router_pynode.c
@@ -17,16 +17,19 @@
* under the License.
*/
-#include <qpid/dispatch/python_embedded.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <qpid/dispatch.h>
+#include "python_private.h"
+#include "qpid/dispatch/python_embedded.h"
+
#include "dispatch_private.h"
-#include "router_private.h"
#include "entity_cache.h"
-#include "python_private.h"
+#include "router_private.h"
+
+#include "qpid/dispatch.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
static qd_log_source_t *log_source = 0;
static PyObject *pyRouter = 0;
diff --git a/src/server.c b/src/server.c
index 907a368..f0a296e 100644
--- a/src/server.c
+++ b/src/server.c
@@ -17,19 +17,28 @@
* under the License.
*/
-#include "python_private.h" // must be first!
+#include "python_private.h" // must be first!
+#include "qpid/dispatch/python_embedded.h"
+
+#include "qpid/dispatch/server.h"
+
+#include "config.h"
#include "dispatch_private.h"
-#include <qpid/dispatch/python_embedded.h>
-
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/log.h>
-#include <qpid/dispatch/amqp.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/failoverlist.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/platform.h>
-#include <qpid/dispatch/proton_utils.h>
+#include "entity.h"
+#include "entity_cache.h"
+#include "policy.h"
+#include "remote_sasl.h"
+#include "server_private.h"
+#include "timer_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/failoverlist.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/platform.h"
+#include "qpid/dispatch/proton_utils.h"
+#include "qpid/dispatch/threading.h"
#include <proton/event.h>
#include <proton/listener.h>
@@ -38,19 +47,10 @@
#include <proton/raw_connection.h>
#include <proton/sasl.h>
-
-#include "entity.h"
-#include "entity_cache.h"
-#include "dispatch_private.h"
-#include "policy.h"
-#include "server_private.h"
-#include "timer_private.h"
-#include "config.h"
-#include "remote_sasl.h"
-#include <stdio.h>
-#include <string.h>
#include <errno.h>
#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
struct qd_server_t {
qd_dispatch_t *qd;
diff --git a/src/server_private.h b/src/server_private.h
index 72415bc..2f374ec 100644
--- a/src/server_private.h
+++ b/src/server_private.h
@@ -19,21 +19,22 @@
* under the License.
*/
-#include <qpid/dispatch/atomic.h>
-#include <qpid/dispatch/enum.h>
-#include <qpid/dispatch/server.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/log.h>
+#include "dispatch_private.h"
+#include "http.h"
+#include "timer_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/enum.h"
+#include "qpid/dispatch/log.h"
+#include "qpid/dispatch/server.h"
+#include "qpid/dispatch/threading.h"
+
#include <proton/engine.h>
#include <proton/event.h>
#include <proton/ssl.h>
-#include "dispatch_private.h"
-#include "timer_private.h"
-#include "http.h"
-
#include <netdb.h> /* For NI_MAXHOST/NI_MAXSERV */
qd_dispatch_t* qd_server_dispatch(qd_server_t *server);
diff --git a/src/timer.c b/src/timer.c
index f01cb53..9041f93 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -17,12 +17,16 @@
* under the License.
*/
+#include "qpid/dispatch/timer.h"
+
#include "dispatch_private.h"
-#include "timer_private.h"
#include "server_private.h"
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/alloc.h>
+#include "timer_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/threading.h"
+
#include <assert.h>
#include <stdio.h>
#include <time.h>
diff --git a/src/timer_private.h b/src/timer_private.h
index 537eb4b..88397b1 100644
--- a/src/timer_private.h
+++ b/src/timer_private.h
@@ -19,9 +19,9 @@
* under the License.
*/
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/timer.h>
-#include <qpid/dispatch/threading.h>
+#include "qpid/dispatch/ctools.h"
+#include "qpid/dispatch/threading.h"
+#include "qpid/dispatch/timer.h"
struct qd_timer_t {
DEQ_LINKS(qd_timer_t);
diff --git a/src/trace_mask.c b/src/trace_mask.c
index 3adb8d5..1586c62 100644
--- a/src/trace_mask.c
+++ b/src/trace_mask.c
@@ -17,11 +17,12 @@
* under the License.
*/
-#include <qpid/dispatch/trace_mask.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/threading.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/alloc.h>
+#include "qpid/dispatch/trace_mask.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/threading.h"
typedef struct {
qd_hash_handle_t *hash_handle;
diff --git a/tests/alloc_test.c b/tests/alloc_test.c
index 6b1262c..05244e1 100644
--- a/tests/alloc_test.c
+++ b/tests/alloc_test.c
@@ -17,8 +17,10 @@
* under the License.
*/
+#include "qpid/dispatch/alloc.h"
+
#include "test_case.h"
-#include <qpid/dispatch/alloc.h>
+
#include <stdio.h>
#include <string.h>
diff --git a/tests/buffer_test.c b/tests/buffer_test.c
index 25eb4cd..8ad38e7 100644
--- a/tests/buffer_test.c
+++ b/tests/buffer_test.c
@@ -18,10 +18,12 @@
*/
#define _GNU_SOURCE
+#include "qpid/dispatch/buffer.h"
+
+#include "test_case.h"
+
#include <stdio.h>
#include <string.h>
-#include "test_case.h"
-#include <qpid/dispatch/buffer.h>
static void fill_buffer(qd_buffer_list_t *list,
diff --git a/tests/c_unittests/test_amqp.cpp b/tests/c_unittests/test_amqp.cpp
index 3dfd2b5..0c6a758 100644
--- a/tests/c_unittests/test_amqp.cpp
+++ b/tests/c_unittests/test_amqp.cpp
@@ -20,7 +20,7 @@
#include "qdr_doctest.h"
extern "C" {
-#include <qpid/dispatch/amqp.h>
+#include "qpid/dispatch/amqp.h"
}
TEST_CASE("test_qd_port_int") {
diff --git a/tests/c_unittests/test_terminus.cpp
b/tests/c_unittests/test_terminus.cpp
index 70b1fa8..b86e222 100644
--- a/tests/c_unittests/test_terminus.cpp
+++ b/tests/c_unittests/test_terminus.cpp
@@ -20,10 +20,11 @@
#include "qdr_doctest.h"
extern "C" {
+#include "qpid/dispatch/router_core.h"
+
#include <../src/router_core/router_core_private.h>
#include <../src/terminus_private.h>
#include <inttypes.h>
-#include <qpid/dispatch/router_core.h>
#include <stdint.h>
#include <stdio.h>
}
diff --git a/tests/clogger.c b/tests/clogger.c
index dcbb6f7..677354f 100644
--- a/tests/clogger.c
+++ b/tests/clogger.c
@@ -24,29 +24,28 @@
* very large streaming messages and/or slow producers.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <math.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <stdarg.h>
-
-
-#include "proton/reactor.h"
-#include "proton/message.h"
#include "proton/connection.h"
-#include "proton/session.h"
-#include "proton/link.h"
#include "proton/delivery.h"
-#include "proton/transport.h"
#include "proton/event.h"
#include "proton/handlers.h"
+#include "proton/link.h"
+#include "proton/message.h"
+#include "proton/reactor.h"
+#include "proton/session.h"
+#include "proton/transport.h"
+
+#include <arpa/inet.h>
+#include <assert.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <math.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
#define DEFAULT_MAX_FRAME 65535
#define BOOL2STR(b) ((b)?"true":"false")
diff --git a/tests/compose_test.c b/tests/compose_test.c
index eec77be..eed3bbf 100644
--- a/tests/compose_test.c
+++ b/tests/compose_test.c
@@ -18,14 +18,15 @@
*/
#define _GNU_SOURCE
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <inttypes.h>
-#include "test_case.h"
-#include <qpid/dispatch.h>
#include "compose_private.h"
+#include "test_case.h"
+#include "qpid/dispatch.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
static char *vector0 =
"\x00\x53\x77" // amqp-value
diff --git a/tests/core_timer_test.c b/tests/core_timer_test.c
index 37df5be..a85e4a7 100644
--- a/tests/core_timer_test.c
+++ b/tests/core_timer_test.c
@@ -17,10 +17,11 @@
* under the License.
*/
+#include "router_core/router_core_private.h"
#include "test_case.h"
+
#include <stdio.h>
#include <string.h>
-#include "router_core/router_core_private.h"
void qdr_process_tick_CT(qdr_core_t *core, qdr_action_t *action, bool discard);
diff --git a/tests/failoverlist_test.c b/tests/failoverlist_test.c
index 0a645d0..c9173ed 100644
--- a/tests/failoverlist_test.c
+++ b/tests/failoverlist_test.c
@@ -18,14 +18,16 @@
*/
#define _GNU_SOURCE
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qpid/dispatch/failoverlist.h"
+
#include "test_case.h"
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/failoverlist.h>
+#include "qpid/dispatch.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
static char *test_failover_list_empty(void *unused)
{
diff --git a/tests/field_test.c b/tests/field_test.c
index 974c63f..c88b9b7 100644
--- a/tests/field_test.c
+++ b/tests/field_test.c
@@ -18,11 +18,13 @@
*/
#include "test_case.h"
+
+#include "qpid/dispatch/hash.h"
+#include "qpid/dispatch/iterator.h"
+#include "qpid/dispatch/router.h"
+
#include <stdio.h>
#include <string.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/hash.h>
-#include <qpid/dispatch/router.h>
#define FAIL_TEXT_SIZE 10000
static char fail_text[FAIL_TEXT_SIZE];
diff --git a/tests/hash_test.c b/tests/hash_test.c
index 04d7dce..6520575 100644
--- a/tests/hash_test.c
+++ b/tests/hash_test.c
@@ -17,13 +17,14 @@
* under the License.
*/
+#include "qpid/dispatch/hash.h"
+
#include "test_case.h"
-#include <stdio.h>
-#include <string.h>
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/hash.h>
+#include "qpid/dispatch/iterator.h"
+#include <stdio.h>
+#include <string.h>
static const unsigned char *keys[] = {
(const unsigned char *) "/global/foo",
diff --git a/tests/message_test.c b/tests/message_test.c
index 18a22b0..04c0c59 100644
--- a/tests/message_test.c
+++ b/tests/message_test.c
@@ -17,15 +17,18 @@
* under the License.
*/
-#include "test_case.h"
-#include <stdio.h>
-#include <string.h>
#include "message_private.h"
-#include <qpid/dispatch/iterator.h>
-#include <qpid/dispatch/amqp.h>
+#include "test_case.h"
+
+#include "qpid/dispatch/amqp.h"
+#include "qpid/dispatch/iterator.h"
+
#include <proton/message.h>
#include <proton/raw_connection.h>
+#include <stdio.h>
+#include <string.h>
+
#define FLAT_BUF_SIZE (100000)
static unsigned char buffer[FLAT_BUF_SIZE];
diff --git a/tests/parse_test.c b/tests/parse_test.c
index 4687189..67ecff0 100644
--- a/tests/parse_test.c
+++ b/tests/parse_test.c
@@ -18,13 +18,15 @@
*/
#define _GNU_SOURCE
-#include <stdio.h>
+#include "test_case.h"
+
+#include "qpid/dispatch.h"
+#include "qpid/dispatch/trace_mask.h"
+
#include <assert.h>
-#include <string.h>
#include <inttypes.h>
-#include "test_case.h"
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/trace_mask.h>
+#include <stdio.h>
+#include <string.h>
struct fs_vector_t {
const char *data;
diff --git a/tests/parse_tree_tests.c b/tests/parse_tree_tests.c
index 123e76b..d09a1ff 100644
--- a/tests/parse_tree_tests.c
+++ b/tests/parse_tree_tests.c
@@ -17,11 +17,11 @@
* under the License.
*/
+#include "parse_tree.h"
#include "test_case.h"
+
#include <stdio.h>
#include <string.h>
-#include "parse_tree.h"
-
static char *test_add_remove(void *context)
{
diff --git a/tests/policy_test.c b/tests/policy_test.c
index afc68c8..48b26ac 100644
--- a/tests/policy_test.c
+++ b/tests/policy_test.c
@@ -17,12 +17,14 @@
* under the License.
*/
+#include "policy.h"
+
+#include "parse_tree.h"
+#include "policy_internal.h"
#include "test_case.h"
+
#include <stdio.h>
#include <string.h>
-#include "policy.h"
-#include "policy_internal.h"
-#include "parse_tree.h"
static char *test_link_name_lookup(void *context)
{
diff --git a/tests/proton_utils_tests.c b/tests/proton_utils_tests.c
index 4f2c9d5..558f8f1 100644
--- a/tests/proton_utils_tests.c
+++ b/tests/proton_utils_tests.c
@@ -18,14 +18,15 @@
*/
#define _GNU_SOURCE
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <inttypes.h>
#include "test_case.h"
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/proton_utils.h>
+#include "qpid/dispatch.h"
+#include "qpid/dispatch/proton_utils.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
typedef struct {
const char *encoded;
diff --git a/tests/run_unit_tests.c b/tests/run_unit_tests.c
index dfe72c1..1138930 100644
--- a/tests/run_unit_tests.c
+++ b/tests/run_unit_tests.c
@@ -17,9 +17,10 @@
* under the License.
*/
-#include <qpid/dispatch/alloc.h>
-#include <qpid/dispatch.h>
-#include <qpid/dispatch/buffer.h>
+#include "qpid/dispatch.h"
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/buffer.h"
+
#include <stdio.h>
int tool_tests(void);
diff --git a/tests/run_unit_tests_size.c b/tests/run_unit_tests_size.c
index 958f69d..70977ec 100644
--- a/tests/run_unit_tests_size.c
+++ b/tests/run_unit_tests_size.c
@@ -17,8 +17,8 @@
* under the License.
*/
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/alloc.h>
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/buffer.h"
void qd_log_initialize(void);
void qd_log_finalize(void);
diff --git a/tests/test-receiver.c b/tests/test-receiver.c
index 5dd6777..3517fad 100644
--- a/tests/test-receiver.c
+++ b/tests/test-receiver.c
@@ -18,25 +18,24 @@
*
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <math.h>
-
-#include "proton/reactor.h"
-#include "proton/message.h"
#include "proton/connection.h"
-#include "proton/session.h"
-#include "proton/link.h"
#include "proton/delivery.h"
#include "proton/event.h"
#include "proton/handlers.h"
+#include "proton/link.h"
+#include "proton/message.h"
+#include "proton/reactor.h"
+#include "proton/session.h"
+#include <errno.h>
+#include <inttypes.h>
+#include <math.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
bool stop = false;
diff --git a/tests/test-sender.c b/tests/test-sender.c
index 38b6823..322de00 100644
--- a/tests/test-sender.c
+++ b/tests/test-sender.c
@@ -20,28 +20,27 @@
#define ADD_ANNOTATIONS 1
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <math.h>
+#include "qpid/dispatch/buffer.h"
+#include "qpid/dispatch/message.h"
-
-#include "proton/reactor.h"
-#include "proton/message.h"
#include "proton/connection.h"
-#include "proton/session.h"
-#include "proton/link.h"
#include "proton/delivery.h"
#include "proton/event.h"
#include "proton/handlers.h"
+#include "proton/link.h"
+#include "proton/message.h"
+#include "proton/reactor.h"
+#include "proton/session.h"
-#include <qpid/dispatch/buffer.h>
-#include <qpid/dispatch/message.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <math.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
#define BOOL2STR(b) ((b)?"true":"false")
diff --git a/tests/thread_test.c b/tests/thread_test.c
index 9e6e159..16d2831 100644
--- a/tests/thread_test.c
+++ b/tests/thread_test.c
@@ -18,15 +18,15 @@
*/
#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdint.h>
-#include <unistd.h>
#include "test_case.h"
-#include <qpid/dispatch/threading.h>
+#include "qpid/dispatch/threading.h"
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
#define thread_count 10
static sys_thread_t *threads[thread_count] = {0};
diff --git a/tests/timer_test.c b/tests/timer_test.c
index 9cb390a..998566b 100644
--- a/tests/timer_test.c
+++ b/tests/timer_test.c
@@ -17,15 +17,17 @@
* under the License.
*/
-#include <stdio.h>
-#include <limits.h>
-#include <qpid/dispatch/timer.h>
+#include "qpid/dispatch/timer.h"
+
#include "dispatch_private.h"
-#include <qpid/dispatch/alloc.h>
-#include "timer_private.h"
#include "test_case.h"
-#include <qpid/dispatch/threading.h>
+#include "timer_private.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/threading.h"
+#include <limits.h>
+#include <stdio.h>
static unsigned long fire_mask;
static unsigned long fired;
diff --git a/tests/tool_test.c b/tests/tool_test.c
index b0d07f3..8632f25 100644
--- a/tests/tool_test.c
+++ b/tests/tool_test.c
@@ -18,11 +18,13 @@
*/
#include "test_case.h"
+
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/bitmask.h"
+#include "qpid/dispatch/ctools.h"
+
#include <stdio.h>
#include <string.h>
-#include <qpid/dispatch/ctools.h>
-#include <qpid/dispatch/bitmask.h>
-#include <qpid/dispatch/alloc.h>
typedef struct item_t {
DEQ_LINKS(struct item_t);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
