You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cl...@apache.org on 2012/11/09 02:05:34 UTC
svn commit: r1407338 - in /qpid/proton/trunk/proton-c/src: buffer.c
codec/codec.c dispatcher/dispatcher.c driver.c engine/engine.c error.c
message/message.c messenger.c parser.c proton.c sasl/sasl.c scanner.c
types.c util.c
Author: cliffjansen
Date: Fri Nov 9 01:05:32 2012
New Revision: 1407338
URL: http://svn.apache.org/viewvc?rev=1407338&view=rev
Log:
PROTON-98: casts required by Microsoft compiler
Modified:
qpid/proton/trunk/proton-c/src/buffer.c
qpid/proton/trunk/proton-c/src/codec/codec.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
qpid/proton/trunk/proton-c/src/driver.c
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/error.c
qpid/proton/trunk/proton-c/src/message/message.c
qpid/proton/trunk/proton-c/src/messenger.c
qpid/proton/trunk/proton-c/src/parser.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/src/sasl/sasl.c
qpid/proton/trunk/proton-c/src/scanner.c
qpid/proton/trunk/proton-c/src/types.c
qpid/proton/trunk/proton-c/src/util.c
Modified: qpid/proton/trunk/proton-c/src/buffer.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/buffer.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/buffer.c (original)
+++ qpid/proton/trunk/proton-c/src/buffer.c Fri Nov 9 01:05:32 2012
@@ -36,11 +36,11 @@ struct pn_buffer_t {
pn_buffer_t *pn_buffer(size_t capacity)
{
- pn_buffer_t *buf = malloc(sizeof(pn_buffer_t));
+ pn_buffer_t *buf = (pn_buffer_t *) malloc(sizeof(pn_buffer_t));
buf->capacity = capacity;
buf->start = 0;
buf->size = 0;
- buf->bytes = capacity ? malloc(capacity) : NULL;
+ buf->bytes = capacity ? (char *) malloc(capacity) : NULL;
return buf;
}
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=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/codec.c (original)
+++ qpid/proton/trunk/proton-c/src/codec/codec.c Fri Nov 9 01:05:32 2012
@@ -717,7 +717,7 @@ pn_type_t pn_code2type(uint8_t code)
switch (code)
{
case PNE_DESCRIPTOR:
- return PN_ARG_ERR;
+ return (pn_type_t) PN_ARG_ERR;
case PNE_NULL:
return PN_NULL;
case PNE_TRUE:
@@ -783,7 +783,7 @@ pn_type_t pn_code2type(uint8_t code)
return PN_MAP;
default:
printf("Unrecognised typecode: %u\n", code);
- return PN_ARG_ERR;
+ return (pn_type_t) PN_ARG_ERR;
}
}
@@ -1117,10 +1117,10 @@ typedef struct {
pn_data_t *pn_data(size_t capacity)
{
- pn_data_t *data = malloc(sizeof(pn_data_t));
+ pn_data_t *data = (pn_data_t *) malloc(sizeof(pn_data_t));
data->capacity = capacity;
data->size = 0;
- data->nodes = capacity ? malloc(capacity * sizeof(pn_node_t)) : NULL;
+ data->nodes = capacity ? (pn_node_t *) malloc(capacity * sizeof(pn_node_t)) : NULL;
data->buf = pn_buffer(64);
data->parent = 0;
data->current = 0;
@@ -1172,7 +1172,7 @@ void pn_data_clear(pn_data_t *data)
int pn_data_grow(pn_data_t *data)
{
data->capacity = 2*(data->capacity ? data->capacity : 16);
- data->nodes = realloc(data->nodes, data->capacity * sizeof(pn_node_t));
+ data->nodes = (pn_node_t *) realloc(data->nodes, data->capacity * sizeof(pn_node_t));
return 0;
}
@@ -1364,7 +1364,7 @@ int pn_data_vfill(pn_data_t *data, const
{
case 's':
{
- char **sptr = ptr;
+ char **sptr = (char **) ptr;
for (int i = 0; i < count; i++)
{
char *sym = *(sptr++);
@@ -1997,7 +1997,7 @@ pn_type_t pn_data_type(pn_data_t *data)
if (node) {
return node->atom.type;
} else {
- return -1;
+ return (pn_type_t) -1;
}
}
@@ -2619,7 +2619,7 @@ pn_type_t pn_data_get_array_type(pn_data
if (node && node->atom.type == PN_ARRAY) {
return node->type;
} else {
- return -1;
+ return (pn_type_t) -1;
}
}
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=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c Fri Nov 9 01:05:32 2012
@@ -31,7 +31,7 @@
pn_dispatcher_t *pn_dispatcher(uint8_t frame_type, void *context)
{
- pn_dispatcher_t *disp = calloc(sizeof(pn_dispatcher_t), 1);
+ pn_dispatcher_t *disp = (pn_dispatcher_t *) calloc(sizeof(pn_dispatcher_t), 1);
disp->frame_type = frame_type;
disp->context = context;
@@ -49,7 +49,7 @@ pn_dispatcher_t *pn_dispatcher(uint8_t f
disp->frame = pn_buffer( 4*1024 );
// XXX
disp->capacity = 4*1024;
- disp->output = malloc(disp->capacity);
+ disp->output = (char *) malloc(disp->capacity);
disp->available = 0;
disp->halt = false;
@@ -247,7 +247,7 @@ int pn_post_frame(pn_dispatcher_t *disp,
while (!(n = pn_write_frame(disp->output + disp->available,
disp->capacity - disp->available, frame))) {
disp->capacity *= 2;
- disp->output = realloc(disp->output, disp->capacity);
+ disp->output = (char *) realloc(disp->output, disp->capacity);
}
if (disp->trace & PN_TRACE_RAW) {
fprintf(stderr, "RAW: \"");
Modified: qpid/proton/trunk/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Fri Nov 9 01:05:32 2012
@@ -178,7 +178,7 @@ pn_listener_t *pn_listener_fd(pn_driver_
{
if (!driver) return NULL;
- pn_listener_t *l = malloc(sizeof(pn_listener_t));
+ pn_listener_t *l = (pn_listener_t *) malloc(sizeof(pn_listener_t));
if (!l) return NULL;
l->driver = driver;
l->listener_next = NULL;
@@ -348,7 +348,7 @@ pn_connector_t *pn_connector_fd(pn_drive
{
if (!driver) return NULL;
- pn_connector_t *c = malloc(sizeof(pn_connector_t));
+ pn_connector_t *c = (pn_connector_t *) malloc(sizeof(pn_connector_t));
if (!c) return NULL;
c->driver = driver;
c->connector_next = NULL;
@@ -614,7 +614,7 @@ void pn_connector_process(pn_connector_t
pn_driver_t *pn_driver()
{
- pn_driver_t *d = malloc(sizeof(pn_driver_t));
+ pn_driver_t *d = (pn_driver_t *) malloc(sizeof(pn_driver_t));
if (!d) return NULL;
d->error = pn_error();
d->listener_head = NULL;
@@ -692,7 +692,7 @@ static void pn_driver_rebuild(pn_driver_
size_t size = d->listener_count + d->connector_count;
while (d->capacity < size + 1) {
d->capacity = d->capacity ? 2*d->capacity : 16;
- d->fds = realloc(d->fds, d->capacity*sizeof(struct pollfd));
+ d->fds = (struct pollfd *) realloc(d->fds, d->capacity*sizeof(struct pollfd));
}
d->nfds = 0;
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=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Fri Nov 9 01:05:32 2012
@@ -419,7 +419,7 @@ void pn_endpoint_tini(pn_endpoint_t *end
pn_connection_t *pn_connection()
{
- pn_connection_t *conn = malloc(sizeof(pn_connection_t));
+ pn_connection_t *conn = (pn_connection_t *) malloc(sizeof(pn_connection_t));
if (!conn) return NULL;
conn->context = NULL;
@@ -694,7 +694,7 @@ pn_link_t *pn_link_next(pn_link_t *link,
pn_session_t *pn_session(pn_connection_t *conn)
{
if (!conn) return NULL;
- pn_session_t *ssn = malloc(sizeof(pn_session_t));
+ pn_session_t *ssn = (pn_session_t *) malloc(sizeof(pn_session_t));
if (!ssn) return NULL;
pn_endpoint_init(&ssn->endpoint, SESSION, conn);
@@ -808,7 +808,7 @@ void pn_map_channel(pn_transport_t *tran
pn_transport_t *pn_transport()
{
- pn_transport_t *transport = malloc(sizeof(pn_transport_t));
+ pn_transport_t *transport = (pn_transport_t *) malloc(sizeof(pn_transport_t));
if (!transport) return NULL;
transport->connection = NULL;
@@ -906,7 +906,7 @@ int pn_terminus_set_type(pn_terminus_t *
pn_terminus_type_t pn_terminus_get_type(pn_terminus_t *terminus)
{
- return terminus ? terminus->type : 0;
+ return terminus ? terminus->type : (pn_terminus_type_t) 0;
}
const char *pn_terminus_get_address(pn_terminus_t *terminus)
@@ -937,7 +937,7 @@ int pn_terminus_set_address_bytes(pn_ter
pn_durability_t pn_terminus_get_durability(pn_terminus_t *terminus)
{
- return terminus ? terminus->durability : 0;
+ return terminus ? terminus->durability : (pn_durability_t) 0;
}
int pn_terminus_set_durability(pn_terminus_t *terminus, pn_durability_t durability)
@@ -949,7 +949,7 @@ int pn_terminus_set_durability(pn_termin
pn_expiry_policy_t pn_terminus_get_expiry_policy(pn_terminus_t *terminus)
{
- return terminus ? terminus->expiry_policy : 0;
+ return terminus ? terminus->expiry_policy : (pn_expiry_policy_t) 0;
}
int pn_terminus_set_expiry_policy(pn_terminus_t *terminus, pn_expiry_policy_t expiry_policy)
@@ -1057,7 +1057,7 @@ pn_link_state_t *pn_handle_state(pn_sess
pn_link_t *pn_sender(pn_session_t *session, const char *name)
{
if (!session) return NULL;
- pn_link_t *snd = malloc(sizeof(pn_link_t));
+ pn_link_t *snd = (pn_link_t *) malloc(sizeof(pn_link_t));
if (!snd) return NULL;
pn_link_init(snd, SENDER, session, name);
return snd;
@@ -1066,7 +1066,7 @@ pn_link_t *pn_sender(pn_session_t *sessi
pn_link_t *pn_receiver(pn_session_t *session, const char *name)
{
if (!session) return NULL;
- pn_link_t *rcv = malloc(sizeof(pn_link_t));
+ pn_link_t *rcv = (pn_link_t *) malloc(sizeof(pn_link_t));
if (!rcv) return NULL;
pn_link_init(rcv, RECEIVER, session, name);
return rcv;
@@ -1108,7 +1108,7 @@ pn_delivery_t *pn_delivery(pn_link_t *li
pn_delivery_t *delivery = link->settled_head;
LL_POP(link, settled);
if (!delivery) {
- delivery = malloc(sizeof(pn_delivery_t));
+ delivery = (pn_delivery_t *) malloc(sizeof(pn_delivery_t));
if (!delivery) return NULL;
delivery->tag = pn_buffer(16);
delivery->bytes = pn_buffer(64);
@@ -1275,7 +1275,7 @@ void pn_real_settle(pn_delivery_t *deliv
void pn_full_settle(pn_delivery_buffer_t *db, pn_delivery_t *delivery)
{
- pn_delivery_state_t *state = delivery->transport_context;
+ pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;
delivery->transport_context = NULL;
if (state) state->delivery = NULL;
pn_real_settle(delivery);
@@ -1325,7 +1325,7 @@ int pn_do_error(pn_transport_t *transpor
int pn_do_open(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
pn_connection_t *conn = transport->connection;
bool container_q, hostname_q;
pn_bytes_t remote_container, remote_hostname;
@@ -1368,7 +1368,7 @@ int pn_do_open(pn_dispatcher_t *disp)
int pn_do_begin(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
bool reply;
uint16_t remote_channel;
pn_sequence_t next;
@@ -1425,7 +1425,7 @@ static pn_expiry_policy_t symbol2policy(
int pn_do_attach(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
pn_bytes_t name;
uint32_t handle;
bool is_sender;
@@ -1519,7 +1519,7 @@ int pn_post_flow(pn_transport_t *transpo
int pn_do_transfer(pn_dispatcher_t *disp)
{
// XXX: multi transfer
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
uint32_t handle;
pn_bytes_t tag;
bool id_present;
@@ -1578,7 +1578,7 @@ int pn_do_transfer(pn_dispatcher_t *disp
int pn_do_flow(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
pn_sequence_t onext, inext, delivery_count;
uint32_t iwin, owin, link_credit;
uint32_t handle;
@@ -1682,7 +1682,7 @@ int pn_do_disposition(pn_dispatcher_t *d
int pn_do_detach(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
uint32_t handle;
bool closed;
int err = pn_scan_args(disp, "D.[Io]", &handle, &closed);
@@ -1709,7 +1709,7 @@ int pn_do_detach(pn_dispatcher_t *disp)
int pn_do_end(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
pn_session_state_t *ssn_state = pn_channel_state(transport, disp->channel);
pn_session_t *session = ssn_state->session;
@@ -1720,7 +1720,7 @@ int pn_do_end(pn_dispatcher_t *disp)
int pn_do_close(pn_dispatcher_t *disp)
{
- pn_transport_t *transport = disp->context;
+ pn_transport_t *transport = (pn_transport_t *) disp->context;
transport->close_rcvd = true;
PN_SET_REMOTE(transport->connection->endpoint.state, PN_REMOTE_CLOSED);
return 0;
@@ -1843,7 +1843,7 @@ bool pn_delivery_buffered(pn_delivery_t
{
if (delivery->settled) return false;
if (pn_link_is_sender(delivery->link)) {
- pn_delivery_state_t *state = delivery->transport_context;
+ pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;
if (state) {
return (delivery->done && !state->sent) || pn_buffer_size(delivery->bytes) > 0;
} else {
@@ -2017,7 +2017,7 @@ int pn_post_disp(pn_transport_t *transpo
pn_session_state_t *ssn_state = pn_session_get_state(transport, link->session);
pn_modified(transport->connection, &link->session->endpoint);
// XXX: check for null state
- pn_delivery_state_t *state = delivery->transport_context;
+ pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;
uint64_t code;
switch(delivery->local_state) {
case PN_ACCEPTED:
@@ -2071,7 +2071,7 @@ int pn_process_tpwork_sender(pn_transpor
pn_session_state_t *ssn_state = pn_session_get_state(transport, link->session);
pn_link_state_t *link_state = pn_link_get_state(ssn_state, link);
if ((int16_t) ssn_state->local_channel >= 0 && (int32_t) link_state->local_handle >= 0) {
- pn_delivery_state_t *state = delivery->transport_context;
+ pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;
if (!state && pn_delivery_buffer_available(&ssn_state->outgoing)) {
state = pn_delivery_buffer_push(&ssn_state->outgoing, delivery);
delivery->transport_context = state;
@@ -2102,7 +2102,7 @@ int pn_process_tpwork_sender(pn_transpor
}
}
- pn_delivery_state_t *state = delivery->transport_context;
+ pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;
// XXX: need to prevent duplicate disposition sending
if ((int16_t) ssn_state->local_channel >= 0 && !delivery->remote_settled
&& state && state->sent) {
@@ -2533,12 +2533,12 @@ pn_link_t *pn_delivery_link(pn_delivery_
pn_disposition_t pn_delivery_local_state(pn_delivery_t *delivery)
{
- return delivery->local_state;
+ return (pn_disposition_t) delivery->local_state;
}
pn_disposition_t pn_delivery_remote_state(pn_delivery_t *delivery)
{
- return delivery->remote_state;
+ return (pn_disposition_t) delivery->remote_state;
}
bool pn_delivery_settled(pn_delivery_t *delivery)
Modified: qpid/proton/trunk/proton-c/src/error.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/error.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/error.c (original)
+++ qpid/proton/trunk/proton-c/src/error.c Fri Nov 9 01:05:32 2012
@@ -34,7 +34,7 @@ struct pn_error_t {
pn_error_t *pn_error()
{
- pn_error_t *error = malloc(sizeof(pn_error_t));
+ pn_error_t *error = (pn_error_t *) malloc(sizeof(pn_error_t));
error->code = 0;
error->text = NULL;
error->root = NULL;
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=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/message/message.c (original)
+++ qpid/proton/trunk/proton-c/src/message/message.c Fri Nov 9 01:05:32 2012
@@ -80,7 +80,7 @@ struct pn_message_t {
pn_message_t *pn_message()
{
- pn_message_t *msg = malloc(sizeof(pn_message_t));
+ pn_message_t *msg = (pn_message_t *) malloc(sizeof(pn_message_t));
msg->durable = false;
msg->priority = PN_DEFAULT_PRIORITY;
msg->ttl = 0;
Modified: qpid/proton/trunk/proton-c/src/messenger.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger.c Fri Nov 9 01:05:32 2012
@@ -242,7 +242,7 @@ static char *build_name(const char *name
pn_messenger_t *pn_messenger(const char *name)
{
- pn_messenger_t *m = malloc(sizeof(pn_messenger_t));
+ pn_messenger_t *m = (pn_messenger_t *) malloc(sizeof(pn_messenger_t));
if (m) {
m->name = build_name(name);
@@ -492,7 +492,7 @@ int pn_messenger_tsync(pn_messenger_t *m
pn_listener_t *l;
while ((l = pn_driver_listener(messenger->driver))) {
- pn_subscription_t *sub = pn_listener_context(l);
+ pn_subscription_t *sub = (pn_subscription_t *) pn_listener_context(l);
char *scheme = sub->scheme;
pn_connector_t *c = pn_listener_accept(l);
pn_transport_t *t = pn_connector_transport(c);
Modified: qpid/proton/trunk/proton-c/src/parser.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/parser.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/parser.c (original)
+++ qpid/proton/trunk/proton-c/src/parser.c Fri Nov 9 01:05:32 2012
@@ -36,7 +36,7 @@ struct pn_parser_t {
pn_parser_t *pn_parser()
{
- pn_parser_t *parser = malloc(sizeof(pn_parser_t));
+ pn_parser_t *parser = (pn_parser_t *) malloc(sizeof(pn_parser_t));
parser->scanner = pn_scanner();
parser->atoms = NULL;
parser->size = 0;
@@ -48,7 +48,7 @@ void pn_parser_ensure(pn_parser_t *parse
{
while (parser->capacity - parser->size < size) {
parser->capacity = parser->capacity ? 2 * parser->capacity : 1024;
- parser->atoms = realloc(parser->atoms, parser->capacity);
+ parser->atoms = (char *) realloc(parser->atoms, parser->capacity);
}
}
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Fri Nov 9 01:05:32 2012
@@ -239,7 +239,7 @@ struct client_context {
void client_callback(pn_connector_t *ctor)
{
- struct client_context *ctx = pn_connector_context(ctor);
+ struct client_context *ctx = (struct client_context *) pn_connector_context(ctor);
if (pn_connector_closed(ctor)) {
ctx->done = true;
}
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=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/sasl/sasl.c (original)
+++ qpid/proton/trunk/proton-c/src/sasl/sasl.c Fri Nov 9 01:05:32 2012
@@ -341,7 +341,7 @@ ssize_t pn_sasl_output(pn_sasl_t *sasl,
int pn_do_init(pn_dispatcher_t *disp)
{
- pn_sasl_t *sasl = disp->context;
+ pn_sasl_t *sasl = (pn_sasl_t *) disp->context;
pn_bytes_t mech;
pn_bytes_t recv;
int err = pn_scan_args(disp, "D.[sz]", &mech, &recv);
@@ -354,7 +354,7 @@ int pn_do_init(pn_dispatcher_t *disp)
int pn_do_mechanisms(pn_dispatcher_t *disp)
{
- pn_sasl_t *sasl = disp->context;
+ pn_sasl_t *sasl = (pn_sasl_t *) disp->context;
sasl->rcvd_init = true;
return 0;
}
Modified: qpid/proton/trunk/proton-c/src/scanner.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/scanner.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/scanner.c (original)
+++ qpid/proton/trunk/proton-c/src/scanner.c Fri Nov 9 01:05:32 2012
@@ -71,7 +71,7 @@ const char *pn_token_type(pn_token_type_
pn_scanner_t *pn_scanner()
{
- pn_scanner_t *scanner = malloc(sizeof(pn_scanner_t));
+ pn_scanner_t *scanner = (pn_scanner_t *) malloc(sizeof(pn_scanner_t));
if (scanner) {
scanner->input = NULL;
scanner->error = pn_error();
Modified: qpid/proton/trunk/proton-c/src/types.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/types.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/types.c (original)
+++ qpid/proton/trunk/proton-c/src/types.c Fri Nov 9 01:05:32 2012
@@ -32,7 +32,7 @@ pn_bytes_t pn_bytes_dup(size_t size, con
{
if (size && start)
{
- char *dup = malloc(size);
+ char *dup = (char *) malloc(size);
memmove(dup, start, size);
return pn_bytes(size, dup);
} else {
Modified: qpid/proton/trunk/proton-c/src/util.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.c?rev=1407338&r1=1407337&r2=1407338&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.c (original)
+++ qpid/proton/trunk/proton-c/src/util.c Fri Nov 9 01:05:32 2012
@@ -140,7 +140,7 @@ bool pn_env_bool(const char *name)
char *pn_strdup(const char *src)
{
if (src) {
- char *dest = malloc((strlen(src)+1)*sizeof(char));
+ char *dest = (char *) malloc((strlen(src)+1)*sizeof(char));
if (!dest) return NULL;
return strcpy(dest, src);
} else {
@@ -156,7 +156,7 @@ char *pn_strndup(const char *src, size_t
size++;
}
- char *dest = malloc(size + 1);
+ char *dest = (char *) malloc(size + 1);
if (!dest) return NULL;
strncpy(dest, src, n);
dest[size] = '\0';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org