You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2014/09/24 07:11:28 UTC
svn commit: r1627219 - in /qpid/proton/trunk: examples/include/pncompat/
proton-c/bindings/php/ proton-c/include/proton/ proton-c/src/
proton-c/src/codec/ proton-c/src/dispatcher/ proton-c/src/engine/
proton-c/src/message/ proton-c/src/messenger/ proto...
Author: astitcher
Date: Wed Sep 24 05:11:27 2014
New Revision: 1627219
URL: http://svn.apache.org/r1627219
Log:
PROTON-696: Rearrange the header files:
- Reduce transitive header inclusions
- Remove proton/util.h and move its contents to src/util.h. All
the defined symbols were internal.
- Stop including with lines like #include "../blah.h" as this
isn't needed anymore.
(Fixes windows breakage from PROTON-676)
Removed:
qpid/proton/trunk/proton-c/include/proton/util.h
Modified:
qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc
qpid/proton/trunk/proton-c/bindings/php/php.i
qpid/proton/trunk/proton-c/include/proton/connection.h
qpid/proton/trunk/proton-c/include/proton/driver.h
qpid/proton/trunk/proton-c/include/proton/sasl.h
qpid/proton/trunk/proton-c/include/proton/ssl.h
qpid/proton/trunk/proton-c/src/codec/codec.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
qpid/proton/trunk/proton-c/src/engine/engine-internal.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/message/message.c
qpid/proton/trunk/proton-c/src/messenger/messenger.c
qpid/proton/trunk/proton-c/src/messenger/store.c
qpid/proton/trunk/proton-c/src/platform.c
qpid/proton/trunk/proton-c/src/posix/driver.c
qpid/proton/trunk/proton-c/src/posix/io.c
qpid/proton/trunk/proton-c/src/posix/selector.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/src/sasl/sasl.c
qpid/proton/trunk/proton-c/src/ssl/openssl.c
qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
qpid/proton/trunk/proton-c/src/tests/parse-url.c
qpid/proton/trunk/proton-c/src/transport/transport.c
qpid/proton/trunk/proton-c/src/url.c
qpid/proton/trunk/proton-c/src/util.c
qpid/proton/trunk/proton-c/src/util.h
qpid/proton/trunk/proton-c/src/windows/driver.c
Modified: qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc (original)
+++ qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc Wed Sep 24 05:11:27 2014
@@ -55,13 +55,14 @@ pn_timestamp_t time_now(void)
return t.QuadPart / 10000 - 11644473600000;
}
#else
-#include <proton/util.h>
#include <sys/time.h>
#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
pn_timestamp_t time_now(void)
{
struct timeval now;
- if (gettimeofday(&now, NULL)) pn_fatal("gettimeofday failed\n");
+ if (gettimeofday(&now, NULL)) {fprintf(stderr, "gettimeofday failed\n"); abort();}
return ((pn_timestamp_t)now.tv_sec) * 1000 + (now.tv_usec / 1000);
}
#endif
Modified: qpid/proton/trunk/proton-c/bindings/php/php.i
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/php.i?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/php.i (original)
+++ qpid/proton/trunk/proton-c/bindings/php/php.i Wed Sep 24 05:11:27 2014
@@ -29,12 +29,16 @@
%header %{
/* Include the headers needed by the code in this wrapper file */
#include <proton/types.h>
-#include <proton/url.h>
-#include <proton/message.h>
+#include <proton/connection.h>
+#include <proton/condition.h>
+#include <proton/delivery.h>
#include <proton/driver.h>
#include <proton/driver_extras.h>
+#include <proton/event.h>
+#include <proton/message.h>
#include <proton/messenger.h>
-#include <proton/ssl.h>
+#include <proton/session.h>
+#include <proton/url.h>
#define zend_error_noreturn zend_error
%}
Modified: qpid/proton/trunk/proton-c/include/proton/connection.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/connection.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/connection.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/connection.h Wed Sep 24 05:11:27 2014
@@ -23,7 +23,12 @@
*/
#include <proton/import_export.h>
+#include <proton/codec.h>
+#include <proton/condition.h>
+#include <proton/error.h>
#include <proton/type_compat.h>
+#include <proton/types.h>
+
#include <stddef.h>
#include <sys/types.h>
Modified: qpid/proton/trunk/proton-c/include/proton/driver.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/driver.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/driver.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/driver.h Wed Sep 24 05:11:27 2014
@@ -24,10 +24,11 @@
#include <proton/import_export.h>
#include <proton/error.h>
-#include <proton/engine.h>
#include <proton/sasl.h>
#include <proton/selectable.h>
#include <proton/ssl.h>
+#include <proton/transport.h>
+#include <proton/types.h>
#ifdef __cplusplus
extern "C" {
Modified: qpid/proton/trunk/proton-c/include/proton/sasl.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/sasl.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/sasl.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/sasl.h Wed Sep 24 05:11:27 2014
@@ -25,7 +25,7 @@
#include <proton/import_export.h>
#include <sys/types.h>
#include <proton/type_compat.h>
-#include <proton/engine.h>
+#include <proton/types.h>
#ifdef __cplusplus
extern "C" {
Modified: qpid/proton/trunk/proton-c/include/proton/ssl.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/ssl.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/ssl.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/ssl.h Wed Sep 24 05:11:27 2014
@@ -25,7 +25,7 @@
#include <proton/import_export.h>
#include <sys/types.h>
#include <proton/type_compat.h>
-#include <proton/engine.h>
+#include <proton/types.h>
#ifdef __cplusplus
extern "C" {
Modified: qpid/proton/trunk/proton-c/src/codec/codec.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/codec/codec.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/codec.c (original)
+++ qpid/proton/trunk/proton-c/src/codec/codec.c Wed Sep 24 05:11:27 2014
@@ -22,7 +22,6 @@
#include <proton/object.h>
#include <proton/codec.h>
#include <proton/error.h>
-#include <proton/util.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
@@ -32,9 +31,9 @@
#include "encodings.h"
#define DEFINE_FIELDS
#include "protocol.h"
-#include "../platform.h"
-#include "../platform_fmt.h"
-#include "../util.h"
+#include "platform.h"
+#include "platform_fmt.h"
+#include "util.h"
#include "decoder.h"
#include "encoder.h"
#include "data.h"
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c Wed Sep 24 05:11:27 2014
@@ -27,8 +27,8 @@
#include <proton/buffer.h>
#include "dispatcher.h"
#include "protocol.h"
-#include "../util.h"
-#include "../platform_fmt.h"
+#include "util.h"
+#include "platform_fmt.h"
#include "dispatch_actions.h"
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h Wed Sep 24 05:11:27 2014
@@ -26,8 +26,9 @@
#ifndef __cplusplus
#include <stdbool.h>
#endif
-#include <proton/buffer.h>
-#include <proton/codec.h>
+#include "proton/buffer.h"
+#include "proton/codec.h"
+#include "proton/transport.h"
typedef struct pn_dispatcher_t pn_dispatcher_t;
Modified: qpid/proton/trunk/proton-c/src/engine/engine-internal.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine-internal.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine-internal.h (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine-internal.h Wed Sep 24 05:11:27 2014
@@ -26,8 +26,8 @@
#include <proton/buffer.h>
#include <proton/engine.h>
#include <proton/types.h>
-#include "../dispatcher/dispatcher.h"
-#include "../util.h"
+#include "dispatcher/dispatcher.h"
+#include "util.h"
typedef enum pn_endpoint_type_t {CONNECTION, SESSION, SENDER, RECEIVER} pn_endpoint_type_t;
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Wed Sep 24 05:11:27 2014
@@ -28,11 +28,9 @@
#include <stdarg.h>
#include <stdio.h>
-#include "../sasl/sasl-internal.h"
-#include "../ssl/ssl-internal.h"
-#include "../platform.h"
-#include "../platform_fmt.h"
-#include "../transport/transport.h"
+#include "platform.h"
+#include "platform_fmt.h"
+#include "transport/transport.h"
// endpoints
Modified: qpid/proton/trunk/proton-c/src/message/message.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/message/message.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/message/message.c (original)
+++ qpid/proton/trunk/proton-c/src/message/message.c Wed Sep 24 05:11:27 2014
@@ -29,8 +29,8 @@
#include <stdio.h>
#include <assert.h>
#include "protocol.h"
-#include "../util.h"
-#include "../platform_fmt.h"
+#include "util.h"
+#include "platform_fmt.h"
ssize_t pn_message_data(char *dst, size_t available, const char *src, size_t size)
{
Modified: qpid/proton/trunk/proton-c/src/messenger/messenger.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/messenger.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/messenger.c Wed Sep 24 05:11:27 2014
@@ -20,10 +20,13 @@
*/
#include <proton/messenger.h>
-#include <proton/sasl.h>
-#include <proton/ssl.h>
-#include <proton/util.h>
+
+#include <proton/connection.h>
+#include <proton/delivery.h>
+#include <proton/event.h>
#include <proton/object.h>
+#include <proton/sasl.h>
+#include <proton/session.h>
#include <proton/selector.h>
#include <assert.h>
@@ -32,13 +35,13 @@
#include <string.h>
#include <stdio.h>
-#include "../util.h"
-#include "../platform.h"
-#include "../platform_fmt.h"
+#include "util.h"
+#include "platform.h"
+#include "platform_fmt.h"
#include "store.h"
#include "transform.h"
#include "subscription.h"
-#include "../selectable.h"
+#include "selectable.h"
typedef struct pn_link_ctx_t pn_link_ctx_t;
Modified: qpid/proton/trunk/proton-c/src/messenger/store.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/store.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger/store.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/store.c Wed Sep 24 05:11:27 2014
@@ -28,7 +28,7 @@
#endif
#include <stdlib.h>
#include <string.h>
-#include "../util.h"
+#include "util.h"
#include "store.h"
typedef struct pni_stream_t pni_stream_t;
Modified: qpid/proton/trunk/proton-c/src/platform.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/platform.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/platform.c (original)
+++ qpid/proton/trunk/proton-c/src/platform.c Wed Sep 24 05:11:27 2014
@@ -21,7 +21,6 @@
#include "platform.h"
#include "util.h"
-#include "proton/util.h" // for pn_fatal() ?should pn_fatal() be public?
/* Allow for systems that do not implement clock_gettime()*/
#ifdef USE_CLOCK_GETTIME
@@ -29,7 +28,7 @@
pn_timestamp_t pn_i_now(void)
{
struct timespec now;
- if (clock_gettime(CLOCK_REALTIME, &now)) pn_fatal("clock_gettime() failed\n");
+ if (clock_gettime(CLOCK_REALTIME, &now)) pni_fatal("clock_gettime() failed\n");
return ((pn_timestamp_t)now.tv_sec) * 1000 + (now.tv_nsec / 1000000);
}
#elif defined(USE_WIN_FILETIME)
@@ -49,7 +48,7 @@ pn_timestamp_t pn_i_now(void)
pn_timestamp_t pn_i_now(void)
{
struct timeval now;
- if (gettimeofday(&now, NULL)) pn_fatal("gettimeofday failed\n");
+ if (gettimeofday(&now, NULL)) pni_fatal("gettimeofday failed\n");
return ((pn_timestamp_t)now.tv_sec) * 1000 + (now.tv_usec / 1000);
}
#endif
@@ -93,12 +92,12 @@ char* pn_i_genuuid(void) {
#ifdef USE_STRERROR_R
#include <string.h>
static void pn_i_strerror(int errnum, char *buf, size_t buflen) {
- if (strerror_r(errnum, buf, buflen) != 0) pn_fatal("strerror_r() failed\n");
+ if (strerror_r(errnum, buf, buflen) != 0) pni_fatal("strerror_r() failed\n");
}
#elif USE_STRERROR_S
#include <string.h>
static void pn_i_strerror(int errnum, char *buf, size_t buflen) {
- if (strerror_s(buf, buflen, errnum) != 0) pn_fatal("strerror_s() failed\n");
+ if (strerror_s(buf, buflen, errnum) != 0) pni_fatal("strerror_s() failed\n");
}
#elif USE_OLD_STRERROR
// This is thread safe on some platforms, and the only option on others
Modified: qpid/proton/trunk/proton-c/src/posix/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/posix/driver.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/posix/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/posix/driver.c Wed Sep 24 05:11:27 2014
@@ -37,11 +37,9 @@
#include <proton/io.h>
#include <proton/sasl.h>
#include <proton/ssl.h>
-#include <proton/util.h>
#include <proton/object.h>
-#include "../util.h"
-#include "../platform.h"
-#include "../ssl/ssl-internal.h"
+#include "util.h"
+#include "platform.h"
/* Decls */
Modified: qpid/proton/trunk/proton-c/src/posix/io.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/posix/io.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/posix/io.c (original)
+++ qpid/proton/trunk/proton-c/src/posix/io.c Wed Sep 24 05:11:27 2014
@@ -35,7 +35,7 @@
#include <fcntl.h>
#include <assert.h>
-#include "../platform.h"
+#include "platform.h"
#define MAX_HOST (1024)
#define MAX_SERV (64)
Modified: qpid/proton/trunk/proton-c/src/posix/selector.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/posix/selector.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/posix/selector.c (original)
+++ qpid/proton/trunk/proton-c/src/posix/selector.c Wed Sep 24 05:11:27 2014
@@ -24,9 +24,9 @@
#include <poll.h>
#include <stdlib.h>
#include <assert.h>
-#include "../platform.h"
-#include "../selectable.h"
-#include "../util.h"
+#include "platform.h"
+#include "selectable.h"
+#include "util.h"
struct pn_selector_t {
struct pollfd *fds;
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Wed Sep 24 05:11:27 2014
@@ -29,16 +29,18 @@
#include "pncompat/misc_funcs.inc"
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <proton/driver.h>
-#include <proton/message.h>
-#include <proton/util.h>
+
+#include "proton/buffer.h"
+#include "proton/codec.h"
+#include "proton/driver.h"
+#include "proton/engine.h"
+#include "proton/message.h"
+#include "proton/version.h"
#include "util.h"
-#include <proton/version.h>
-#include <proton/codec.h>
-#include <proton/buffer.h>
-#include <proton/parser.h>
#include "platform_fmt.h"
+
#include "protocol.h"
void error_exit(const char* fmt, ...)
Modified: qpid/proton/trunk/proton-c/src/sasl/sasl.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/sasl/sasl.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/sasl/sasl.c (original)
+++ qpid/proton/trunk/proton-c/src/sasl/sasl.c Wed Sep 24 05:11:27 2014
@@ -25,13 +25,13 @@
#include <string.h>
#include <proton/buffer.h>
#include <proton/framing.h>
-#include <proton/engine.h> // XXX: just needed for PN_EOS
+#include <proton/error.h>
#include <proton/sasl.h>
#include "protocol.h"
#include "dispatch_actions.h"
-#include "../dispatcher/dispatcher.h"
-#include "../engine/engine-internal.h"
-#include "../util.h"
+#include "engine/engine-internal.h"
+#include "dispatcher/dispatcher.h"
+#include "util.h"
struct pn_sasl_t {
Modified: qpid/proton/trunk/proton-c/src/ssl/openssl.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/openssl.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/openssl.c Wed Sep 24 05:11:27 2014
@@ -20,11 +20,10 @@
*/
#include <proton/ssl.h>
-#include "./ssl-internal.h"
#include <proton/engine.h>
-#include "../engine/engine-internal.h"
-#include "../platform.h"
-#include "../util.h"
+#include "engine/engine-internal.h"
+#include "platform.h"
+#include "util.h"
#include <openssl/ssl.h>
#include <openssl/dh.h>
Modified: qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c Wed Sep 24 05:11:27 2014
@@ -20,6 +20,8 @@
*/
#include <proton/ssl.h>
+#include <proton/error.h>
+#include <proton/transport.h>
/** @file
Modified: qpid/proton/trunk/proton-c/src/tests/parse-url.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/tests/parse-url.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/tests/parse-url.c (original)
+++ qpid/proton/trunk/proton-c/src/tests/parse-url.c Wed Sep 24 05:11:27 2014
@@ -20,7 +20,6 @@
*/
#include <stdarg.h>
-#include <proton/type_compat.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -29,8 +28,9 @@
#undef NDEBUG
#include <assert.h>
-#include <proton/error.h>
-#include <proton/util.h>
+#include "proton/type_compat.h"
+#include "proton/error.h"
+#include "util.h"
static inline bool equalStrP(const char* s1, const char* s2)
{
Modified: qpid/proton/trunk/proton-c/src/transport/transport.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/transport/transport.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/transport/transport.c (original)
+++ qpid/proton/trunk/proton-c/src/transport/transport.c Wed Sep 24 05:11:27 2014
@@ -19,7 +19,7 @@
*
*/
-#include "../engine/engine-internal.h"
+#include "engine/engine-internal.h"
#include <stdlib.h>
#include <string.h>
#include <proton/framing.h>
@@ -30,10 +30,10 @@
#include <stdarg.h>
#include <stdio.h>
-#include "../sasl/sasl-internal.h"
-#include "../ssl/ssl-internal.h"
-#include "../platform.h"
-#include "../platform_fmt.h"
+#include "sasl/sasl-internal.h"
+#include "ssl/ssl-internal.h"
+#include "platform.h"
+#include "platform_fmt.h"
static ssize_t transport_consume(pn_transport_t *transport);
Modified: qpid/proton/trunk/proton-c/src/url.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/url.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/url.c (original)
+++ qpid/proton/trunk/proton-c/src/url.c Wed Sep 24 05:11:27 2014
@@ -21,7 +21,7 @@
#include "proton/url.h"
#include "proton/object.h"
-#include "proton/util.h"
+#include "util.h"
#include "platform.h"
#include <stdlib.h>
Modified: qpid/proton/trunk/proton-c/src/util.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.c (original)
+++ qpid/proton/trunk/proton-c/src/util.c Wed Sep 24 05:11:27 2014
@@ -27,7 +27,6 @@
#include <ctype.h>
#include <string.h>
#include <proton/error.h>
-#include <proton/util.h>
#include <proton/types.h>
#include "util.h"
@@ -200,17 +199,17 @@ void pni_parse_url(char *url, char **sch
if (*pass) pni_urldecode(*pass, *pass);
}
-void pn_vfatal(const char *fmt, va_list ap)
+void pni_vfatal(const char *fmt, va_list ap)
{
vfprintf(stderr, fmt, ap);
abort();
}
-void pn_fatal(const char *fmt, ...)
+void pni_fatal(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- pn_vfatal(fmt, ap);
+ pni_vfatal(fmt, ap);
va_end(ap);
}
Modified: qpid/proton/trunk/proton-c/src/util.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.h?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.h (original)
+++ qpid/proton/trunk/proton-c/src/util.h Wed Sep 24 05:11:27 2014
@@ -33,6 +33,9 @@
#include <proton/types.h>
#include <proton/object.h>
+PN_EXTERN void pni_parse_url(char *url, char **scheme, char **user, char **pass, char **host, char **port, char **path);
+void pni_fatal(const char *fmt, ...);
+void pni_vfatal(const char *fmt, va_list ap);
PN_EXTERN ssize_t pn_quote_data(char *dst, size_t capacity, const char *src, size_t size);
int pn_quote(pn_string_t *dst, const char *src, size_t size);
PN_EXTERN void pn_fprint_data(FILE *stream, const char *bytes, size_t size);
Modified: qpid/proton/trunk/proton-c/src/windows/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/windows/driver.c?rev=1627219&r1=1627218&r2=1627219&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/windows/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/windows/driver.c Wed Sep 24 05:11:27 2014
@@ -31,14 +31,12 @@
#include <proton/io.h>
#include <proton/sasl.h>
#include <proton/ssl.h>
-#include <proton/util.h>
#include <proton/object.h>
#include <proton/selector.h>
#include <proton/types.h>
-#include "../selectable.h"
-#include "../util.h"
-#include "../platform.h"
-#include "../ssl/ssl-internal.h"
+#include "selectable.h"
+#include "util.h"
+#include "platform.h"
/*
* This driver provides limited thread safety for some operations on pn_connector_t objects.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org