Author: cliffjansen
Date: Sun Feb 3 04:56:31 2013
New Revision: 1441857
URL: http://svn.apache.org/viewvc?rev=1441857&view=rev
Log:
PROTON-159: C++ support part 3. See https://reviews.apache.org/r/9086/
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/src/buffer.c
qpid/proton/trunk/proton-c/src/codec/codec.c
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/messenger.c
qpid/proton/trunk/proton-c/src/posix/driver.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/src/ssl/openssl.c
qpid/proton/trunk/proton-c/src/util.c
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Sun Feb 3 04:56:31 2013
@@ -187,7 +187,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
if (ENABLE_WARNING_ERROR)
set (WERROR "-Werror")
endif (ENABLE_WARNING_ERROR)
- set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors -Wc++-compat
-Wwrite-strings")
+ set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors -Wc++-compat
-Wwrite-strings -Wsign-compare")
set (COMPILE_LANGUAGE_FLAGS "-std=c99")
set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
if (ENABLE_UNDEFINED_ERROR)
Modified: qpid/proton/trunk/proton-c/src/buffer.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/buffer.c?rev=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/buffer.c (original)
+++ qpid/proton/trunk/proton-c/src/buffer.c Sun Feb 3 04:56:31 2013
@@ -238,9 +238,9 @@ void pn_buffer_clear(pn_buffer_t *buf)
static void pn_buffer_rotate (pn_buffer_t *buf, size_t sz) {
if (sz == 0) return;
- int c = 0, v = 0;
+ unsigned c = 0, v = 0;
for (; c < buf->capacity; v++) {
- int t = v, tp = v + sz;
+ unsigned t = v, tp = v + sz;
char tmp = buf->bytes[v];
c++;
while (tp != v) {
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=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/codec.c (original)
+++ qpid/proton/trunk/proton-c/src/codec/codec.c Sun Feb 3 04:56:31 2013
@@ -129,7 +129,7 @@ int pn_bytes_format(pn_bytes_t *bytes, c
va_start(ap, fmt);
int n = vsnprintf(bytes->start, bytes->size, fmt, ap);
va_end(ap);
- if (n >= bytes->size) {
+ if (n >= (int) bytes->size) {
return PN_OVERFLOW;
} else if (n >= 0) {
pn_bytes_ltrim(bytes, n);
@@ -261,7 +261,7 @@ int pn_format_atom(pn_bytes_t *bytes, pn
pfx = ":";
bin = atom.u.as_symbol;
quote = false;
- for (int i = 0; i < bin.size; i++) {
+ for (unsigned i = 0; i < bin.size; i++) {
if (!isalpha(bin.start[i])) {
quote = true;
break;
@@ -914,7 +914,7 @@ int pn_decode_value(pn_bytes_t *bytes, p
if (type < 0) return type;
atoms->start[0] = (pn_iatom_t) {.type=PN_TYPE, .u.type=type};
pn_atoms_ltrim(atoms, 1);
- for (int i = 0; i < count; i++)
+ for (unsigned i = 0; i < count; i++)
{
e = pn_decode_value(bytes, atoms, acode);
if (e) return e;
@@ -937,7 +937,7 @@ int pn_decode_value(pn_bytes_t *bytes, p
return PN_ARG_ERR;
}
- for (int i = 0; i < count; i++)
+ for (unsigned i = 0; i < count; i++)
{
int e = pn_decode_atom(bytes, atoms);
if (e) return e;
@@ -1087,7 +1087,7 @@ pn_bytes_t *pn_data_bytes(pn_data_t *dat
void pn_data_rebase(pn_data_t *data, char *base)
{
- for (int i = 0; i < data->size; i++) {
+ for (unsigned i = 0; i < data->size; i++) {
pn_node_t *node = &data->nodes[i];
if (node->data) {
pn_bytes_t *bytes = pn_data_bytes(data, node);
@@ -1919,7 +1919,7 @@ void pn_data_dump(pn_data_t *data)
{
char buf[1024];
printf("{current=%zi, parent=%zi}\n", data->current, data->parent);
- for (int i = 0; i < data->size; i++)
+ for (unsigned i = 0; i < data->size; i++)
{
pn_node_t *node = &data->nodes[i];
pn_bytes_t bytes = pn_bytes(1024, buf);
@@ -2240,7 +2240,7 @@ int pn_data_parse_atoms(pn_data_t *data,
int count = 0;
int step, i;
- for (i = offset; i < atoms.size; i++) {
+ for (i = offset; i < (int) atoms.size; i++) {
if (count == limit) return i - offset;
pn_iatom_t atom = atoms.start[i];
if (atom.type == PN_TYPE) return PN_ERR;
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=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Sun Feb 3 04:56:31 2013
@@ -231,7 +231,7 @@ void pn_transport_free(pn_transport_t *t
pn_ssl_free(transport->ssl);
pn_sasl_free(transport->sasl);
pn_dispatcher_free(transport->disp);
- for (int i = 0; i < transport->session_capacity; i++) {
+ for (unsigned i = 0; i < transport->session_capacity; i++) {
pn_delivery_buffer_free(&transport->sessions[i].incoming);
pn_delivery_buffer_free(&transport->sessions[i].outgoing);
free(transport->sessions[i].links);
@@ -258,7 +258,7 @@ void pn_add_session(pn_connection_t *con
void pn_remove_session(pn_connection_t *conn, pn_session_t *ssn)
{
- for (int i = 0; i < conn->session_count; i++)
+ for (unsigned i = 0; i < conn->session_count; i++)
{
if (conn->sessions[i] == ssn)
{
@@ -320,7 +320,7 @@ void pn_add_link(pn_session_t *ssn, pn_l
void pn_remove_link(pn_session_t *ssn, pn_link_t *link)
{
- for (int i = 0; i < ssn->link_count; i++)
+ for (unsigned i = 0; i < ssn->link_count; i++)
{
if (ssn->links[i] == link)
{
@@ -801,7 +801,7 @@ pn_session_state_t *pn_session_get_state
{
int old_capacity = transport->session_capacity;
PN_ENSURE(transport->sessions, transport->session_capacity, ssn->id + 1,
pn_session_state_t);
- for (int i = old_capacity; i < transport->session_capacity; i++)
+ for (unsigned i = old_capacity; i < transport->session_capacity; i++)
{
transport->sessions[i] = (pn_session_state_t) {.session=NULL,
.local_channel=-1,
@@ -816,13 +816,13 @@ pn_session_state_t *pn_session_get_state
pn_session_state_t *pn_channel_state(pn_transport_t *transport, uint16_t
channel)
{
- PN_ENSUREZ(transport->channels, transport->channel_capacity, channel + 1,
pn_session_state_t *);
+ PN_ENSUREZ(transport->channels, transport->channel_capacity, (size_t)
channel + 1, pn_session_state_t *);
return transport->channels[channel];
}
void pn_map_channel(pn_transport_t *transport, uint16_t channel,
pn_session_state_t *state)
{
- PN_ENSUREZ(transport->channels, transport->channel_capacity, channel + 1,
pn_session_state_t *);
+ PN_ENSUREZ(transport->channels, transport->channel_capacity, (size_t)
channel + 1, pn_session_state_t *);
state->remote_channel = channel;
transport->channels[channel] = state;
}
@@ -1082,7 +1082,7 @@ pn_link_state_t *pn_link_get_state(pn_se
{
int old_capacity = ssn_state->link_capacity;
PN_ENSURE(ssn_state->links, ssn_state->link_capacity, link->id + 1,
pn_link_state_t);
- for (int i = old_capacity; i < ssn_state->link_capacity; i++)
+ for (unsigned i = old_capacity; i < ssn_state->link_capacity; i++)
{
ssn_state->links[i] = (pn_link_state_t) {.link=NULL, .local_handle = -1,
.remote_handle=-1};
@@ -1459,7 +1459,7 @@ pn_link_state_t *pn_find_link(pn_session
{
pn_endpoint_type_t type = is_sender ? SENDER : RECEIVER;
- for (int i = 0; i < ssn_state->session->link_count; i++)
+ for (unsigned i = 0; i < ssn_state->session->link_count; i++)
{
pn_link_t *link = ssn_state->session->links[i];
if (link->endpoint.type == type &&
@@ -2797,7 +2797,7 @@ static inline int pn_set_buf(char *dst,
dst[0] = '\0';
return 0;
} else {
- int n = strlen(src) + 1;
+ unsigned n = strlen(src) + 1;
if (n > capacity) {
return PN_ARG_ERR;
} else {
Modified: qpid/proton/trunk/proton-c/src/messenger.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger.c?rev=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger.c Sun Feb 3 04:56:31 2013
@@ -357,7 +357,7 @@ void pn_messenger_free(pn_messenger_t *m
pn_error_free(messenger->error);
pn_queue_tini(&messenger->incoming);
pn_queue_tini(&messenger->outgoing);
- for (int i = 0; i < messenger->sub_count; i++) {
+ for (unsigned i = 0; i < messenger->sub_count; i++) {
free(messenger->subscriptions[i].scheme);
}
free(messenger->subscriptions);
@@ -1116,7 +1116,7 @@ int pn_messenger_get(pn_messenger_t *mes
if (err) return pn_error_format(messenger->error, err, "get: error
growing buffer");
char *encoded = pn_buffer_bytes(buf).start;
ssize_t n = pn_link_recv(l, encoded, pending);
- if (n != pending) {
+ if (n != (ssize_t) pending) {
return pn_error_format(messenger->error, n, "didn't receive pending
bytes: %zi", n);
}
n = pn_link_recv(l, encoded + pending, 1);
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=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/posix/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/posix/driver.c Sun Feb 3 04:56:31 2013
@@ -757,7 +757,7 @@ static void pn_driver_rebuild(pn_driver_
d->nfds++;
pn_listener_t *l = d->listener_head;
- for (int i = 0; i < d->listener_count; i++) {
+ for (unsigned i = 0; i < d->listener_count; i++) {
d->fds[d->nfds].fd = l->fd;
d->fds[d->nfds].events = POLLIN;
d->fds[d->nfds].revents = 0;
@@ -767,7 +767,7 @@ static void pn_driver_rebuild(pn_driver_
}
pn_connector_t *c = d->connector_head;
- for (int i = 0; i < d->connector_count; i++)
+ for (unsigned i = 0; i < d->connector_count; i++)
{
if (!c->closed) {
d->wakeup = pn_timestamp_min(d->wakeup, c->wakeup);
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Sun Feb 3 04:56:31 2013
@@ -336,7 +336,7 @@ void client_callback(pn_connector_t *cto
printf(" payload = \"");
}
while (true) {
- size_t n = pn_link_recv(link, msg, 1024);
+ ssize_t n = pn_link_recv(link, msg, 1024);
if (n == PN_EOS) {
pn_link_advance(link);
pn_delivery_update(delivery, PN_ACCEPTED);
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=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/openssl.c Sun Feb 3 04:56:31 2013
@@ -198,7 +198,7 @@ static bool match_dns_pattern( const cha
{
if (memchr( pattern, '*', plen ) == NULL)
- return (plen == strlen(hostname) &&
+ return (plen == (int) strlen(hostname) &&
strncasecmp( pattern, hostname, plen ) == 0);
/* dns wildcarded pattern - RFC2818 */
@@ -212,7 +212,7 @@ static bool match_dns_pattern( const cha
cptr = (const char *) memchr( pattern, '.', plen );
len = (cptr) ? cptr - pattern : plen;
- if (len > sizeof(plabel) - 1) return false;
+ if (len > (int) sizeof(plabel) - 1) return false;
memcpy( plabel, pattern, len );
plabel[len] = 0;
pattern = cptr + 1;
@@ -220,7 +220,7 @@ static bool match_dns_pattern( const cha
cptr = (const char *) memchr( hostname, '.', slen );
len = (cptr) ? cptr - hostname : slen;
- if (len > sizeof(slabel) - 1) return false;
+ if (len > (int) sizeof(slabel) - 1) return false;
memcpy( slabel, hostname, len );
slabel[len] = 0;
hostname = cptr + 1;
@@ -1218,7 +1218,7 @@ int pn_ssl_get_peer_hostname( pn_ssl_t *
if (hostname) *hostname = '\0';
return 0;
}
- int len = strlen(ssl->peer_hostname);
+ unsigned len = strlen(ssl->peer_hostname);
if (hostname) {
if (len >= *bufsize) return -1;
strcpy( hostname, ssl->peer_hostname );
Modified: qpid/proton/trunk/proton-c/src/util.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.c?rev=1441857&r1=1441856&r2=1441857&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.c (original)
+++ qpid/proton/trunk/proton-c/src/util.c Sun Feb 3 04:56:31 2013
@@ -36,7 +36,7 @@
ssize_t pn_quote_data(char *dst, size_t capacity, const char *src, size_t size)
{
int idx = 0;
- for (int i = 0; i < size; i++)
+ for (unsigned i = 0; i < size; i++)
{
uint8_t c = src[i];
if (isprint(c)) {
@@ -162,7 +162,7 @@ char *pn_strdup(const char *src)
char *pn_strndup(const char *src, size_t n)
{
if (src) {
- int size = 0;
+ unsigned size = 0;
for (const char *c = src; size < n && *c; c++) {
size++;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
