You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/03/06 15:47:10 UTC
[1/4] qpid-proton git commit: PROTON-1781 [c-proactor] fix mis-named
netaddr functions
Repository: qpid-proton
Updated Branches:
refs/heads/master 817609a54 -> d4241caa0
PROTON-1781 [c-proactor] fix mis-named netaddr functions
The old functions are deprecated but still present - old binaries can still be
linked with new libraies, old source will fail to compile with a deprecation
message unless -DPN_USE_DEPRECATED_API is present in CMAKE_C_FLAGS
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/06c3d6e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/06c3d6e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/06c3d6e2
Branch: refs/heads/master
Commit: 06c3d6e2f46811038853b95401cd017cb21e2713
Parents: 817609a
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Mar 2 16:51:27 2018 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Mar 2 16:51:27 2018 -0500
----------------------------------------------------------------------
examples/c/broker.c | 2 +-
examples/c/direct.c | 2 +-
proton-c/bindings/cpp/src/listener.cpp | 2 +-
proton-c/include/proton/import_export.h | 14 ++++++++++++++
proton-c/include/proton/netaddr.h | 15 ++++++++++++---
proton-c/src/proactor/epoll.c | 6 +++---
proton-c/src/proactor/libuv.c | 6 +++---
proton-c/src/proactor/proactor-internal.c | 5 +++++
proton-c/src/proactor/win_iocp.c | 6 +++---
proton-c/src/tests/proactor.c | 12 ++++++------
10 files changed, 49 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/examples/c/broker.c
----------------------------------------------------------------------
diff --git a/examples/c/broker.c b/examples/c/broker.c
index 3257cec..23a91b1 100644
--- a/examples/c/broker.c
+++ b/examples/c/broker.c
@@ -290,7 +290,7 @@ static void handle(broker_t* b, pn_event_t* e) {
case PN_LISTENER_OPEN: {
char port[256]; /* Get the listening port */
- pn_netaddr_host_port(pn_netaddr_listening(pn_event_listener(e)), NULL, 0, port, sizeof(port));
+ pn_netaddr_host_port(pn_listener_addr(pn_event_listener(e)), NULL, 0, port, sizeof(port));
printf("listening on %s\n", port);
fflush(stdout);
break;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/examples/c/direct.c
----------------------------------------------------------------------
diff --git a/examples/c/direct.c b/examples/c/direct.c
index 9ecda7c..6d8642c 100644
--- a/examples/c/direct.c
+++ b/examples/c/direct.c
@@ -231,7 +231,7 @@ static bool handle(app_data_t* app, pn_event_t* event) {
case PN_LISTENER_OPEN: {
char port[256]; /* Get the listening port */
- pn_netaddr_host_port(pn_netaddr_listening(pn_event_listener(event)), NULL, 0, port, sizeof(port));
+ pn_netaddr_host_port(pn_listener_addr(pn_event_listener(event)), NULL, 0, port, sizeof(port));
printf("listening on %s\n", port);
fflush(stdout);
break;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/bindings/cpp/src/listener.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/listener.cpp b/proton-c/bindings/cpp/src/listener.cpp
index 4788b6a..b62d171 100644
--- a/proton-c/bindings/cpp/src/listener.cpp
+++ b/proton-c/bindings/cpp/src/listener.cpp
@@ -41,7 +41,7 @@ void listener::stop() { if (listener_) pn_listener_close(listener_); }
int listener::port() {
char port[16] = "";
- pn_netaddr_host_port(pn_netaddr_listening(listener_), NULL, 0, port, sizeof(port));
+ pn_netaddr_host_port(pn_listener_addr(listener_), NULL, 0, port, sizeof(port));
int i = atoi(port);
if (!i) throw error("listener has no port");
return i;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/include/proton/import_export.h
----------------------------------------------------------------------
diff --git a/proton-c/include/proton/import_export.h b/proton-c/include/proton/import_export.h
index ee09132..14e6b82 100644
--- a/proton-c/include/proton/import_export.h
+++ b/proton-c/include/proton/import_export.h
@@ -65,6 +65,20 @@
# define PNX_EXTERN PN_IMPORT
#endif
+#if ! defined(PN_USE_DEPRECATED_API)
+# if defined(WIN32)
+# define PN_DEPRECATED(message) __declspec(deprecated(message))
+# elif defined __GNUC__
+# if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40500
+# define PN_DEPRECATED(message) __attribute__((deprecated))
+# else
+# define PN_DEPRECATED(message) __attribute__((deprecated(message)))
+# endif
+# endif
+#endif
+#ifndef PN_DEPRECATED
+# define PN_DEPRECATED(message)
+#endif
/**
* @endcond
*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/include/proton/netaddr.h
----------------------------------------------------------------------
diff --git a/proton-c/include/proton/netaddr.h b/proton-c/include/proton/netaddr.h
index ffc9c6a..13fcdee 100644
--- a/proton-c/include/proton/netaddr.h
+++ b/proton-c/include/proton/netaddr.h
@@ -53,13 +53,13 @@ PNP_EXTERN int pn_netaddr_str(const pn_netaddr_t *addr, char *buf, size_t size);
* Get the local address of a transport. Return `NULL` if not available.
* Pointer is invalid after the transport closes (PN_TRANSPORT_CLOSED event is handled)
*/
-PNP_EXTERN const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t);
+PNP_EXTERN const pn_netaddr_t *pn_transport_local_addr(pn_transport_t *t);
/**
* Get the local address of a transport. Return `NULL` if not available.
* Pointer is invalid after the transport closes (PN_TRANSPORT_CLOSED event is handled)
*/
-PNP_EXTERN const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t);
+PNP_EXTERN const pn_netaddr_t *pn_transport_remote_addr(pn_transport_t *t);
/**
* Get the listening addresses of a listener.
@@ -77,7 +77,7 @@ PNP_EXTERN const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t);
* Use pn_netaddr_next() to iterate over the list.
* Pointer is invalid after the listener closes (PN_LISTENER_CLOSED event is handled)
*/
-PNP_EXTERN const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l);
+PNP_EXTERN const pn_netaddr_t *pn_listener_addr(pn_listener_t *l);
/**
* @return Pointer to the next address in a list of addresses, NULL if at the end of the list or
@@ -105,6 +105,15 @@ PNP_EXTERN size_t pn_netaddr_socklen(const pn_netaddr_t *na);
*/
PNP_EXTERN int pn_netaddr_host_port(const pn_netaddr_t* na, char *host, size_t hlen, char *port, size_t plen);
+/** @deprecated @{ */
+PN_DEPRECATED("use pn_transport_local_addr")
+PNP_EXTERN const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t);
+PN_DEPRECATED("use pn_transport_remote_addr()")
+PNP_EXTERN const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t);
+PN_DEPRECATED("use pn_listener_addr()")
+PNP_EXTERN const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l);
+/** @} */
+
/**
* @}
*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/src/proactor/epoll.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/epoll.c b/proton-c/src/proactor/epoll.c
index 483173a..8ff5831 100644
--- a/proton-c/src/proactor/epoll.c
+++ b/proton-c/src/proactor/epoll.c
@@ -2196,17 +2196,17 @@ void pn_proactor_disconnect(pn_proactor_t *p, pn_condition_t *cond) {
wake_notify(&p->context);
}
-const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_local_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc? &pc->local : NULL;
}
-const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_remote_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc ? &pc->remote : NULL;
}
-const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l) {
+const pn_netaddr_t *pn_listener_addr(pn_listener_t *l) {
return l->acceptors_size > 0 ? &l->acceptors[0].addr : NULL;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/src/proactor/libuv.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/libuv.c b/proton-c/src/proactor/libuv.c
index 9329967..b542b20 100644
--- a/proton-c/src/proactor/libuv.c
+++ b/proton-c/src/proactor/libuv.c
@@ -1324,17 +1324,17 @@ void pn_listener_accept2(pn_listener_t *l, pn_connection_t *c, pn_transport_t *t
work_notify(&l->work);
}
-const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_local_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc? &pc->local : NULL;
}
-const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_remote_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc ? &pc->remote : NULL;
}
-const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l) {
+const pn_netaddr_t *pn_listener_addr(pn_listener_t *l) {
return l->addrs ? &l->addrs[0] : NULL;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/src/proactor/proactor-internal.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/proactor-internal.c b/proton-c/src/proactor/proactor-internal.c
index 6d96fee..8c53785 100644
--- a/proton-c/src/proactor/proactor-internal.c
+++ b/proton-c/src/proactor/proactor-internal.c
@@ -23,6 +23,7 @@
#include "proactor-internal.h"
#include <proton/error.h>
#include <proton/listener.h>
+#include <proton/netaddr.h>
#include <proton/proactor.h>
#include <stdio.h>
@@ -96,4 +97,8 @@ void pn_listener_accept(pn_listener_t *l, pn_connection_t *c) {
pn_listener_accept2(l, c, NULL);
}
+/* Deprecated, keep backwards compatible library symbols */
+const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t) { return pn_transport_local_addr(t); }
+const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t) { return pn_transport_remote_addr(t); }
+const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l) { return pn_listener_addr(l); }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/src/proactor/win_iocp.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/win_iocp.c b/proton-c/src/proactor/win_iocp.c
index fe09876..e41ac5b 100644
--- a/proton-c/src/proactor/win_iocp.c
+++ b/proton-c/src/proactor/win_iocp.c
@@ -3404,17 +3404,17 @@ void pn_proactor_disconnect(pn_proactor_t *p, pn_condition_t *cond) {
}
}
-const pn_netaddr_t *pn_netaddr_local(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_local_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc? &pc->local : NULL;
}
-const pn_netaddr_t *pn_netaddr_remote(pn_transport_t *t) {
+const pn_netaddr_t *pn_transport_remote_addr(pn_transport_t *t) {
pconnection_t *pc = get_pconnection(pn_transport_connection(t));
return pc ? &pc->remote : NULL;
}
-const pn_netaddr_t *pn_netaddr_listening(pn_listener_t *l) {
+const pn_netaddr_t *pn_listener_addr(pn_listener_t *l) {
return l->psockets ? &l->psockets[0].listen_addr : NULL;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06c3d6e2/proton-c/src/tests/proactor.c
----------------------------------------------------------------------
diff --git a/proton-c/src/tests/proactor.c b/proton-c/src/tests/proactor.c
index a9eef18..97f1dee 100644
--- a/proton-c/src/tests/proactor.c
+++ b/proton-c/src/tests/proactor.c
@@ -144,7 +144,7 @@ struct addrinfo {
struct addrinfo listener_info(pn_listener_t *l) {
struct addrinfo ai = {{0}};
- const pn_netaddr_t *na = pn_netaddr_listening(l);
+ const pn_netaddr_t *na = pn_listener_addr(l);
TEST_ASSERT(0 == pn_netaddr_host_port(na, ai.host, sizeof(ai.host), ai.port, sizeof(ai.port)));
for (na = pn_netaddr_next(na); na; na = pn_netaddr_next(na)) { /* Check that ports are consistent */
char port[MAX_STR];
@@ -880,7 +880,7 @@ static void test_netaddr(test_t *t) {
char cr[1024], cl[1024], sr[1024], sl[1024];
pn_transport_t *ct = pn_connection_transport(c);
- const pn_netaddr_t *na = pn_netaddr_remote(ct);
+ const pn_netaddr_t *na = pn_transport_remote_addr(ct);
pn_netaddr_str(na, cr, sizeof(cr));
TEST_STR_IN(t, listener_info(l).port, cr); /* remote address has listening port */
@@ -888,11 +888,11 @@ static void test_netaddr(test_t *t) {
pn_transport_t *st = pn_connection_transport(s);
if (!TEST_CHECK(t, st)) return;
- pn_netaddr_str(pn_netaddr_local(st), sl, sizeof(sl));
+ pn_netaddr_str(pn_transport_local_addr(st), sl, sizeof(sl));
TEST_STR_EQUAL(t, cr, sl); /* client remote == server local */
- pn_netaddr_str(pn_netaddr_local(ct), cl, sizeof(cl));
- pn_netaddr_str(pn_netaddr_remote(st), sr, sizeof(sr));
+ pn_netaddr_str(pn_transport_local_addr(ct), cl, sizeof(cl));
+ pn_netaddr_str(pn_transport_remote_addr(st), sr, sizeof(sr));
TEST_STR_EQUAL(t, cl, sr); /* client local == server remote */
char host[MAX_STR] = "";
@@ -903,7 +903,7 @@ static void test_netaddr(test_t *t) {
TEST_STR_EQUAL(t, listener_info(l).port, serv);
/* Make sure you can use NULL, 0 to get length of address string without a crash */
- size_t len = pn_netaddr_str(pn_netaddr_local(ct), NULL, 0);
+ size_t len = pn_netaddr_str(pn_transport_local_addr(ct), NULL, 0);
TEST_CHECKF(t, strlen(cl) == len, "%d != %d", strlen(cl), len);
TEST_PROACTORS_DRAIN(tps);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/4] qpid-proton git commit: NO-JIRA [ruby] remove extraneous "lib/"
directory from ruby install
Posted by ac...@apache.org.
NO-JIRA [ruby] remove extraneous "lib/" directory from ruby install
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/daaf0921
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/daaf0921
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/daaf0921
Branch: refs/heads/master
Commit: daaf09213776de21a4037593ac4ade096650ffc6
Parents: 20c1418
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Mar 5 16:57:22 2018 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Mar 6 09:59:03 2018 -0500
----------------------------------------------------------------------
proton-c/bindings/ruby/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/daaf0921/proton-c/bindings/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt
index d0747cb..3b70b2a 100644
--- a/proton-c/bindings/ruby/CMakeLists.txt
+++ b/proton-c/bindings/ruby/CMakeLists.txt
@@ -101,7 +101,7 @@ if (NOT RUBY_ARCHLIB_DIR)
endif()
install(TARGETS cproton-ruby DESTINATION ${RUBY_ARCHLIB_DIR} COMPONENT Ruby)
-install(DIRECTORY lib DESTINATION ${RUBY_ARCHLIB_DIR} COMPONENT Ruby)
+install(DIRECTORY lib/ DESTINATION ${RUBY_ARCHLIB_DIR} COMPONENT Ruby)
## Tests
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/4] qpid-proton git commit: PROTON-1784 [ruby]
Connection#each_sender/each_receiver take a block
Posted by ac...@apache.org.
PROTON-1784 [ruby] Connection#each_sender/each_receiver take a block
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d4241caa
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d4241caa
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d4241caa
Branch: refs/heads/master
Commit: d4241caa003c2449a531811b626c8b5728f26af4
Parents: daaf092
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Mar 6 09:57:15 2018 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Mar 6 10:29:42 2018 -0500
----------------------------------------------------------------------
examples/ruby/example_test.rb | 22 +++++++++++-----------
proton-c/bindings/ruby/lib/core/connection.rb | 13 ++++++++++---
2 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d4241caa/examples/ruby/example_test.rb
----------------------------------------------------------------------
diff --git a/examples/ruby/example_test.rb b/examples/ruby/example_test.rb
index 80a20db..7008dd1 100755
--- a/examples/ruby/example_test.rb
+++ b/examples/ruby/example_test.rb
@@ -46,7 +46,7 @@ class ExampleTest < MiniTest::Test
end
def test_helloworld
- assert_output("Hello world!", "helloworld.rb", $url, __method__)
+ assert_output("Hello world!", "helloworld.rb", $url, "examples")
end
def test_client_server
@@ -60,40 +60,40 @@ class ExampleTest < MiniTest::Test
-> And the mome raths outgrabe.
<- AND THE MOME RATHS OUTGRABE.
EOS
- server = run_script("server.rb", $url, __method__)
- assert_output(want.strip, "client.rb", $url, __method__)
+ server = run_script("server.rb", $url, "examples")
+ assert_output(want.strip, "client.rb", $url, "examples")
ensure
Process.kill :TERM, server.pid if server
end
def test_send_recv
- assert_output("All 10 messages confirmed!", "simple_send.rb", $url, __method__)
+ assert_output("All 10 messages confirmed!", "simple_send.rb", $url, "examples")
want = (0..9).reduce("") { |x,y| x << "Received: sequence #{y}\n" }
- assert_output(want.strip, "simple_recv.rb", $url, __method__)
+ assert_output(want.strip, "simple_recv.rb", $url, "examples")
end
def test_ssl_send_recv
- out = run_script("ssl_send.rb", $url, __method__).read.strip
+ out = run_script("ssl_send.rb", $url, "examples").read.strip
assert_match(/Connection secured with "...*\"\nAll 10 messages confirmed!/, out)
want = (0..9).reduce("") { |x,y| x << "Received: sequence #{y}\n" }
- assert_output(want.strip, "simple_recv.rb", $url, __method__)
+ assert_output(want.strip, "simple_recv.rb", $url, "examples")
end
def test_direct_recv
url = test_url
- p = run_script("direct_recv.rb", url, __method__)
+ p = run_script("direct_recv.rb", url, "examples")
p.readline # Wait till ready
- assert_output("All 10 messages confirmed!", "simple_send.rb", url, __method__)
+ assert_output("All 10 messages confirmed!", "simple_send.rb", url, "examples")
want = (0..9).reduce("") { |x,y| x << "Received: sequence #{y}\n" }
assert_equal(want.strip, p.read.strip)
end
def test_direct_send
url = test_url
- p = run_script("direct_send.rb", url, __method__)
+ p = run_script("direct_send.rb", url, "examples")
p.readline # Wait till ready
want = (0..9).reduce("") { |x,y| x << "Received: sequence #{y}\n" }
- assert_output(want.strip, "simple_recv.rb", url, __method__)
+ assert_output(want.strip, "simple_recv.rb", url, "examples")
assert_equal("All 10 messages confirmed!", p.read.strip)
end
end
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d4241caa/proton-c/bindings/ruby/lib/core/connection.rb
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/lib/core/connection.rb b/proton-c/bindings/ruby/lib/core/connection.rb
index b94eaff..8adc259 100644
--- a/proton-c/bindings/ruby/lib/core/connection.rb
+++ b/proton-c/bindings/ruby/lib/core/connection.rb
@@ -253,17 +253,24 @@ module Qpid::Proton
return enum_for(:each_link) unless block_given?
l = Cproton.pn_link_head(@impl, 0);
while l
- yield Link.wrap(l)
+ l2 = l # get next before yield, in case yield closes l and unlinks it
l = Cproton.pn_link_next(l, 0)
+ yield Link.wrap(l2)
end
self
end
# Get the {Sender} links - see {#each_link}
- def each_sender() each_link.select { |l| l.sender? }; end
+ def each_sender()
+ return enum_for(:each_sender) unless block_given?
+ each_link.select { |l| yield l if l.sender? }
+ end
# Get the {Receiver} links - see {#each_link}
- def each_receiver() each_link.select { |l| l.receiver? }; end
+ def each_receiver()
+ return enum_for(:each_receiver) unless block_given?
+ each_link.select { |l| yield l if l.receiver? }
+ end
# @deprecated use {#MessagingHandler} to handle work
def work_head
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/4] qpid-proton git commit: NO-JIRA: [c-examples] Fix typos in in
broker.c example comments
Posted by ac...@apache.org.
NO-JIRA: [c-examples] Fix typos in in broker.c example comments
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/20c14188
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/20c14188
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/20c14188
Branch: refs/heads/master
Commit: 20c141885d1c9f8d5789a3ec23f49635d8965660
Parents: 06c3d6e
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Mar 5 16:44:52 2018 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Mar 6 09:58:49 2018 -0500
----------------------------------------------------------------------
examples/c/broker.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/20c14188/examples/c/broker.c
----------------------------------------------------------------------
diff --git a/examples/c/broker.c b/examples/c/broker.c
index 23a91b1..e401edd 100644
--- a/examples/c/broker.c
+++ b/examples/c/broker.c
@@ -106,7 +106,7 @@ static void queue_destroy(queue_t *q) {
free(q->name);
}
-/* Send a message on s, or record s as eating if no messages.
+/* Send a message on s, or record s as waiting if there are no messages to send.
Called in s dispatch loop, assumes s has credit.
*/
static void queue_send(queue_t *q, pn_link_t *s) {
@@ -132,7 +132,7 @@ static void queue_send(queue_t *q, pn_link_t *s) {
pn_delivery_t *d = pn_delivery(s, pn_dtag((char*)&tag, sizeof(tag)));
pn_link_send(s, m.start, m.size);
pn_link_advance(s);
- pn_delivery_settle(d); /* Pre-settled: unreliable, there will bea no ack/ */
+ pn_delivery_settle(d); /* Pre-settled: unreliable, there will be no ack/ */
free(m.start);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org