diff options
author | Alan Antonuk <alan.antonuk@gmail.com> | 2017-03-01 21:31:10 -0800 |
---|---|---|
committer | Alan Antonuk <alan.antonuk@gmail.com> | 2017-03-01 21:33:02 -0800 |
commit | f1d0cbe1443ab293e13b75d6ce3b54a5e672218d (patch) | |
tree | 1635ccf3dd2ff7436d1cf1ae09f72acfbb372079 | |
parent | 4398756f06ce8128f5d9d57b9f31e0acb274b53f (diff) | |
download | rabbitmq-c-f1d0cbe1443ab293e13b75d6ce3b54a5e672218d.tar.gz |
Lib: simplify reply generation in simple_rpc_inner
-rw-r--r-- | librabbitmq/amqp_socket.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c index 0c7c052..d645f0d 100644 --- a/librabbitmq/amqp_socket.c +++ b/librabbitmq/amqp_socket.c @@ -1079,9 +1079,7 @@ static amqp_rpc_reply_t simple_rpc_inner( status = amqp_send_method(state, channel, request_id, decoded_request_method); if (status < 0) { - result.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION; - result.library_error = status; - return result; + return amqp_rpc_reply_error(status); } { @@ -1119,18 +1117,14 @@ retry: channel_pool = amqp_get_or_create_channel_pool(state, frame.channel); if (NULL == channel_pool) { - result.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION; - result.library_error = AMQP_STATUS_NO_MEMORY; - return result; + return amqp_rpc_reply_error(AMQP_STATUS_NO_MEMORY); } frame_copy = amqp_pool_alloc(channel_pool, sizeof(amqp_frame_t)); link = amqp_pool_alloc(channel_pool, sizeof(amqp_link_t)); if (frame_copy == NULL || link == NULL) { - result.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION; - result.library_error = AMQP_STATUS_NO_MEMORY; - return result; + return amqp_rpc_reply_error(AMQP_STATUS_NO_MEMORY); } *frame_copy = frame; |