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 138d084 DISPATCH-836 Add a .c file for every (non-private) include
file (#1211)
138d084 is described below
commit 138d084d7a0d9dbeed2991affffc8f669563be68
Author: Jiri Daněk <[email protected]>
AuthorDate: Sun Nov 14 12:54:23 2021 +0100
DISPATCH-836 Add a .c file for every (non-private) include file (#1211)
---
...ress_lookup_server.h => address_lookup_utils.h} | 6 ++--
include/qpid/dispatch/policy_spec.h | 3 ++
src/CMakeLists.txt | 15 +++++++++-
src/address_lookup_utils.c | 3 +-
include/qpid/dispatch/policy_spec.h => src/alloc.c | 21 +-------------
src/amqp.c | 1 -
src/{aprintf.h => aprintf.c} | 25 +++--------------
src/aprintf.h | 32 ++--------------------
.../qpid/dispatch/policy_spec.h => src/atomic.c | 21 +-------------
.../qpid/dispatch/policy_spec.h => src/ctools.c | 21 +-------------
include/qpid/dispatch/policy_spec.h => src/enum.c | 21 ++------------
.../dispatch/policy_spec.h => src/policy_spec.c | 21 +-------------
.../policy_spec.h => src/protocol_adaptor.c | 21 +-------------
.../policy_spec.h => src/qd_asan_interface.c | 21 +-------------
src/qd_asan_interface.h | 2 ++
.../qpid/dispatch/policy_spec.h => src/router.c | 21 +-------------
.../dispatch/policy_spec.h => src/router_core.c | 21 +-------------
.../router_core/core_attach_address_lookup.c | 21 +-------------
.../policy_spec.h => src/router_core/module.c | 21 +-------------
.../{lookup_client.c => address_lookup_client.c} | 2 +-
.../address_lookup_server/address_lookup_server.c | 3 +-
.../dispatch/policy_spec.h => src/static_assert.c | 21 ++------------
tests/threaded_timer_test.c | 18 ++++++------
23 files changed, 55 insertions(+), 307 deletions(-)
diff --git a/include/qpid/dispatch/address_lookup_server.h
b/include/qpid/dispatch/address_lookup_utils.h
similarity index 95%
rename from include/qpid/dispatch/address_lookup_server.h
rename to include/qpid/dispatch/address_lookup_utils.h
index ca88953..8d57f5c 100644
--- a/include/qpid/dispatch/address_lookup_server.h
+++ b/include/qpid/dispatch/address_lookup_utils.h
@@ -1,5 +1,5 @@
-#ifndef router_core_address_lookup_server_h
-#define router_core_address_lookup__server_h 1
+#ifndef router_core_address_lookup_utils_h
+#define router_core_address_lookup_utils_h 1
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -80,4 +80,4 @@ qcm_address_lookup_status_t
qcm_link_route_lookup_decode(qd_iterator_t *properti
qd_iterator_t *body,
bool
*is_link_route,
bool
*has_destinations);
-#endif // router_core_address_lookup_server_h
+#endif // router_core_address_lookup_utils_h
diff --git a/include/qpid/dispatch/policy_spec.h
b/include/qpid/dispatch/policy_spec.h
index 69e50ed..f6d67f9 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/include/qpid/dispatch/policy_spec.h
@@ -19,6 +19,9 @@
* under the License.
*/
+#include <stdbool.h>
+#include <stdint.h>
+
typedef struct {
int maxFrameSize;
int maxSessionWindow;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 073ecc6..3ea0183 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,12 +47,17 @@ set(qpid_dispatch_SOURCES
adaptors/http1/http1_server.c
adaptors/http1/http1_request_info.c
adaptors/tcp_adaptor.c
+ alloc.c
alloc_pool.c
+ aprintf.c
amqp.c
+ atomic.c
bitmask.c
buffer.c
+ enum.c
error.c
compose.c
+ ctools.c
connection_manager.c
container.c
delivery_state.c
@@ -68,6 +73,8 @@ set(qpid_dispatch_SOURCES
parse.c
parse_tree.c
policy.c
+ policy_spec.c
+ protocol_adaptor.c
proton_utils.c
remote_sasl.c
posix/threading.c
@@ -76,6 +83,8 @@ set(qpid_dispatch_SOURCES
router_config.c
address_lookup_utils.c
platform.c
+ router.c
+ router_core.c
router_core/agent.c
router_core/agent_address.c
router_core/agent_config_address.c
@@ -86,6 +95,7 @@ set(qpid_dispatch_SOURCES
router_core/agent_router.c
router_core/agent_conn_link_route.c
router_core/connections.c
+ router_core/core_attach_address_lookup.c
router_core/core_events.c
router_core/core_link_endpoint.c
router_core/core_client_api.c
@@ -101,6 +111,7 @@ set(qpid_dispatch_SOURCES
router_core/terminus.c
router_core/transfer.c
router_core/core_timer.c
+ router_core/module.c
router_core/modules/edge_router/module.c
router_core/modules/edge_router/addr_proxy.c
router_core/modules/edge_router/connection_manager.c
@@ -108,8 +119,8 @@ set(qpid_dispatch_SOURCES
router_core/modules/edge_router/edge_mgmt.c
router_core/modules/test_hooks/core_test_hooks.c
router_core/modules/edge_addr_tracking/edge_addr_tracking.c
+ router_core/modules/address_lookup_client/address_lookup_client.c
router_core/modules/address_lookup_server/address_lookup_server.c
- router_core/modules/address_lookup_client/lookup_client.c
router_core/modules/heartbeat_edge/heartbeat_edge.c
router_core/modules/heartbeat_server/heartbeat_server.c
router_core/modules/stuck_delivery_detection/delivery_tracker.c
@@ -118,10 +129,12 @@ set(qpid_dispatch_SOURCES
router_node.c
router_pynode.c
schema_enum.c
+ static_assert.c
server.c
timer.c
trace_mask.c
python_utils.c
+ qd_asan_interface.c
)
set(qpid_dispatch_INCLUDES
diff --git a/src/address_lookup_utils.c b/src/address_lookup_utils.c
index 99d713a..7dcf2de 100644
--- a/src/address_lookup_utils.c
+++ b/src/address_lookup_utils.c
@@ -21,7 +21,8 @@
// API for interacting with the core address lookup server
//
-#include "qpid/dispatch/address_lookup_server.h"
+#include "qpid/dispatch/address_lookup_utils.h"
+
#include "qpid/dispatch/amqp.h"
#include "qpid/dispatch/parse.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/alloc.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/alloc.c
index 69e50ed..f13dfd7 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/alloc.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/alloc.h"
diff --git a/src/amqp.c b/src/amqp.c
index f4f1a41..cd69dfb 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -23,7 +23,6 @@
#include <netdb.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
const char * const QD_MA_PREFIX = "x-opt-qd.";
const char * const QD_MA_INGRESS = "x-opt-qd.ingress";
diff --git a/src/aprintf.h b/src/aprintf.c
similarity index 68%
copy from src/aprintf.h
copy to src/aprintf.c
index 6ae2c82..94e6cfe 100644
--- a/src/aprintf.h
+++ b/src/aprintf.c
@@ -1,5 +1,3 @@
-#ifndef BPRINTF_H
-#define BPRINTF_H
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,15 +17,14 @@
* under the License.
*/
+#include "aprintf.h"
+
#include <assert.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
-/**
- Variadic appending printf - see aprintf()
- */
-static int vaprintf(char **begin, char *end, const char *format, va_list
ap_in) {
+int vaprintf(char **begin, char *end, const char *format, va_list ap_in) {
int size = end - *begin;
if (size == 0) return EINVAL;
va_list ap;
@@ -46,24 +43,10 @@ static int vaprintf(char **begin, char *end, const char
*format, va_list ap_in)
return 0;
}
-/**
- Appending printf.
-
- Print to buffer at *begin with null terminator, end points after end of
buffer.
- Advance *begin to point to the null terminator.
-. Return value:
- - 0 on success: advance *begin to the null terminator.
- - n > 0: printing was truncated and would have printed n characters. *begin
== end-1
- - n < 0: error (return value of vsnprintf) no change to *begin
- */
-static int aprintf(char **begin, char *end, const char *format, ...) {
+int aprintf(char **begin, char *end, const char *format, ...) {
va_list ap;
va_start(ap, format);
int n = vaprintf(begin, end, format, ap);
va_end(ap);
return n;
}
-
-
-
-#endif
diff --git a/src/aprintf.h b/src/aprintf.h
index 6ae2c82..b259d44 100644
--- a/src/aprintf.h
+++ b/src/aprintf.h
@@ -19,32 +19,12 @@
* under the License.
*/
-#include <assert.h>
-#include <errno.h>
#include <stdarg.h>
-#include <stdio.h>
/**
Variadic appending printf - see aprintf()
*/
-static int vaprintf(char **begin, char *end, const char *format, va_list
ap_in) {
- int size = end - *begin;
- if (size == 0) return EINVAL;
- va_list ap;
- va_copy(ap, ap_in);
- int n = vsnprintf(*begin, size, format, ap);
- va_end(ap);
- if (n < 0) return n;
- if (n >= size) {
- *begin = end-1;
- assert(**begin == '\0');
- return n;
- }
- *begin += n;
- assert(*begin < end);
- assert(**begin == '\0');
- return 0;
-}
+int vaprintf(char **begin, char *end, const char *format, va_list ap_in);
/**
Appending printf.
@@ -56,14 +36,6 @@ static int vaprintf(char **begin, char *end, const char
*format, va_list ap_in)
- n > 0: printing was truncated and would have printed n characters. *begin
== end-1
- n < 0: error (return value of vsnprintf) no change to *begin
*/
-static int aprintf(char **begin, char *end, const char *format, ...) {
- va_list ap;
- va_start(ap, format);
- int n = vaprintf(begin, end, format, ap);
- va_end(ap);
- return n;
-}
-
-
+int aprintf(char **begin, char *end, const char *format, ...);
#endif
diff --git a/include/qpid/dispatch/policy_spec.h b/src/atomic.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/atomic.c
index 69e50ed..b13f184 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/atomic.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/atomic.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/ctools.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/ctools.c
index 69e50ed..7804969 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/ctools.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/ctools.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/enum.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/enum.c
index 69e50ed..10d526d 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/enum.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,6 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
+#include "qpid/dispatch/enum.h"
-#endif
+typedef int make_this_translation_unit_not_be_empty;
diff --git a/include/qpid/dispatch/policy_spec.h b/src/policy_spec.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/policy_spec.c
index 69e50ed..7f736f5 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/policy_spec.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/policy_spec.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/protocol_adaptor.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/protocol_adaptor.c
index 69e50ed..32cb135 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/protocol_adaptor.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/protocol_adaptor.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/qd_asan_interface.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/qd_asan_interface.c
index 69e50ed..b4ae8bc 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/qd_asan_interface.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qd_asan_interface.h"
diff --git a/src/qd_asan_interface.h b/src/qd_asan_interface.h
index d66d096..06f57ca 100644
--- a/src/qd_asan_interface.h
+++ b/src/qd_asan_interface.h
@@ -25,6 +25,8 @@
* See #include <sanitizer/asan_interface.h> in Clang for the source.
*/
+#include <stddef.h>
+
#if defined(__clang__)
# define QD_HAS_ADDRESS_SANITIZER __has_feature(address_sanitizer)
#elif defined (__GNUC__) && defined(__SANITIZE_ADDRESS__)
diff --git a/include/qpid/dispatch/policy_spec.h b/src/router.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/router.c
index 69e50ed..8cfa23a 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/router.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/router.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/router_core.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/router_core.c
index 69e50ed..acf4dd6 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/router_core.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "qpid/dispatch/router_core.h"
diff --git a/include/qpid/dispatch/policy_spec.h
b/src/router_core/core_attach_address_lookup.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/router_core/core_attach_address_lookup.c
index 69e50ed..81c6884 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/router_core/core_attach_address_lookup.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "core_attach_address_lookup.h"
diff --git a/include/qpid/dispatch/policy_spec.h b/src/router_core/module.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/router_core/module.c
index 69e50ed..e53f6b1 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/router_core/module.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,4 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
-
-#endif
+#include "module.h"
diff --git a/src/router_core/modules/address_lookup_client/lookup_client.c
b/src/router_core/modules/address_lookup_client/address_lookup_client.c
similarity index 99%
rename from src/router_core/modules/address_lookup_client/lookup_client.c
rename to src/router_core/modules/address_lookup_client/address_lookup_client.c
index 4030e8b..a877e43 100644
--- a/src/router_core/modules/address_lookup_client/lookup_client.c
+++ b/src/router_core/modules/address_lookup_client/address_lookup_client.c
@@ -23,7 +23,7 @@
#include "module.h"
#include "router_core_private.h"
-#include "qpid/dispatch/address_lookup_server.h"
+#include "qpid/dispatch/address_lookup_utils.h"
#include "qpid/dispatch/ctools.h"
#include "qpid/dispatch/discriminator.h"
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 40f93bf..e2bd3b2 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,11 +17,10 @@
* under the License.
*/
-#include "qpid/dispatch/address_lookup_server.h"
-
#include "core_link_endpoint.h"
#include "module.h"
+#include "qpid/dispatch/address_lookup_utils.h"
#include "qpid/dispatch/ctools.h"
#include <inttypes.h>
diff --git a/include/qpid/dispatch/policy_spec.h b/src/static_assert.c
similarity index 59%
copy from include/qpid/dispatch/policy_spec.h
copy to src/static_assert.c
index 69e50ed..3307836 100644
--- a/include/qpid/dispatch/policy_spec.h
+++ b/src/static_assert.c
@@ -1,5 +1,3 @@
-#ifndef __policy_spec_h__
-#define __policy_spec_h__
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,21 +17,6 @@
* under the License.
*/
-typedef struct {
- int maxFrameSize;
- int maxSessionWindow;
- int maxSessions;
- int maxSenders;
- int maxReceivers;
- uint64_t maxMessageSize;
- bool allowDynamicSource;
- bool allowAnonymousSender;
- bool allowUserIdProxy;
- bool allowWaypointLinks;
- bool allowFallbackLinks;
- bool allowDynamicLinkRoutes;
- bool allowAdminStatusUpdate;
- bool outgoingConnection;
-} qd_policy_spec_t;
+#include "qpid/dispatch/static_assert.h"
-#endif
+typedef int make_this_translation_unit_not_be_empty;
diff --git a/tests/threaded_timer_test.c b/tests/threaded_timer_test.c
index 2cab8a2..73188d6 100644
--- a/tests/threaded_timer_test.c
+++ b/tests/threaded_timer_test.c
@@ -17,17 +17,17 @@
* under the License.
*/
-#include <stdio.h>
-#include <limits.h>
-#include <sys/select.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/atomic.h>
-#include <qpid/dispatch/threading.h>
+#include "timer_private.h"
+#include "qpid/dispatch/alloc.h"
+#include "qpid/dispatch/atomic.h"
+#include "qpid/dispatch/threading.h"
+#include "qpid/dispatch/timer.h"
+
+#include <stdio.h>
+#include <sys/select.h>
// test the interaction of threads and timers
//
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
}
ticker_lock = sys_mutex();
-
+
sys_thread_t *ticker = sys_thread(ticker_thread, 0);
result = test_simple(argv[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
