qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [62/89] [abbrv] qpid-proton git commit: NO-JIRA: [c] Minor comment & example fixes, multi-thread API doc fixes
Date Tue, 03 Jul 2018 22:13:51 GMT
NO-JIRA: [c] Minor comment & example fixes, multi-thread API doc fixes


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/811d683a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/811d683a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/811d683a

Branch: refs/heads/go1
Commit: 811d683a090f00bc732073624c36b8bc51de1c05
Parents: df467c4
Author: Alan Conway <aconway@redhat.com>
Authored: Fri Feb 16 09:12:13 2018 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Apr 11 18:20:31 2018 -0400

----------------------------------------------------------------------
 c/examples/broker.c         | 2 +-
 c/include/proton/netaddr.h  | 2 +-
 c/include/proton/proactor.h | 7 +++----
 cpp/examples/broker.cpp     | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/811d683a/c/examples/broker.c
----------------------------------------------------------------------
diff --git a/c/examples/broker.c b/c/examples/broker.c
index 852fa3a..dcb0158 100644
--- a/c/examples/broker.c
+++ b/c/examples/broker.c
@@ -289,7 +289,7 @@ static void handle(broker_t* b, pn_event_t* e) {
   switch (pn_event_type(e)) {
 
    case PN_LISTENER_OPEN: {
-     char port[256];             /* Get the listening port */
+     char port[PN_MAX_ADDR];    /* Get the listening 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);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/811d683a/c/include/proton/netaddr.h
----------------------------------------------------------------------
diff --git a/c/include/proton/netaddr.h b/c/include/proton/netaddr.h
index 4d422cf..1ac8c21 100644
--- a/c/include/proton/netaddr.h
+++ b/c/include/proton/netaddr.h
@@ -42,7 +42,7 @@ extern "C" {
 typedef struct pn_netaddr_t pn_netaddr_t;
 
 /**
- * Format a network address as a human-readable string in `buf`.
+ * Format a network address string in `buf`.
  *
  * @return the length of the string (excluding trailing '\0'), if >= size then
  * the address was truncated.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/811d683a/c/include/proton/proactor.h
----------------------------------------------------------------------
diff --git a/c/include/proton/proactor.h b/c/include/proton/proactor.h
index be20ff1..77e0d84 100644
--- a/c/include/proton/proactor.h
+++ b/c/include/proton/proactor.h
@@ -74,7 +74,7 @@ extern "C" {
 #define PN_MAX_ADDR 1060
 
 /**
- * Format a host:port address string for pn_proactor_connect2() or pn_proactor_listen2()
+ * Format a host:port address string for pn_proactor_connect() or pn_proactor_listen()
  *
  * @param[out] addr address is copied to this buffer, with trailing '\0'
  * @param[in] size  size of addr buffer
@@ -234,8 +234,7 @@ PNP_EXTERN void pn_proactor_interrupt(pn_proactor_t *proactor);
  * will be delivered to the next available thread.
  *
  * Calling pn_proactor_set_timeout() again before the PN_PROACTOR_TIMEOUT
- * is delivered will cancel the previous timeout and deliver an event only after
- * the new timeout.
+ * is delivered replaces the previous timeout value.
  *
  * @note Thread-safe
  */
@@ -256,7 +255,7 @@ PNP_EXTERN void pn_proactor_cancel_timeout(pn_proactor_t *proactor);
  * and so on) remain intact, but the transport is closed and unbound. The
  * proactor will not return any more events for this connection. The caller must
  * call pn_connection_free(), either directly or indirectly by re-using @p
- * connection in another call to pn_proactor_connect2() or pn_proactor_listen2().
+ * connection in another call to pn_proactor_connect() or pn_proactor_listen().
  *
  * @note **Not thread-safe**.  Call this function from a connection
  * event handler.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/811d683a/cpp/examples/broker.cpp
----------------------------------------------------------------------
diff --git a/cpp/examples/broker.cpp b/cpp/examples/broker.cpp
index 65384b3..47d6109 100644
--- a/cpp/examples/broker.cpp
+++ b/cpp/examples/broker.cpp
@@ -52,8 +52,8 @@ int hardware_concurrency() {return 1;}
 
 #include "fake_cpp11.hpp"
 
-// This is a simplified model for a message broker, that only allows for messages to go to
a
-// single receiver.
+// This is a simplified model for a message broker, that only allows for
+// messages to go to a single receiver.
 //
 // This broker is multithread safe and if compiled with C++11 with a multithreaded Proton
 // binding library will use as many threads as there are thread resources available (usually


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message