From a2a91f532b7e648b2468acad39ae7169ac020d0a Mon Sep 17 00:00:00 2001 From: Alan Antonuk Date: Thu, 11 Apr 2013 10:53:59 -0700 Subject: Fix code formatting to match the rest of the lib --- examples/amqps_bind.c | 15 ++++---- examples/amqps_consumer.c | 34 ++++++++++-------- examples/amqps_exchange_declare.c | 9 ++--- examples/amqps_listen.c | 74 +++++++++++++++++++++------------------ examples/amqps_listenq.c | 70 +++++++++++++++++++----------------- examples/amqps_producer.c | 31 ++++++++-------- examples/amqps_sendstring.c | 23 ++++++------ examples/amqps_unbind.c | 15 ++++---- examples/utils.c | 3 +- 9 files changed, 149 insertions(+), 125 deletions(-) (limited to 'examples') diff --git a/examples/amqps_bind.c b/examples/amqps_bind.c index 8724ad7..53c5256 100644 --- a/examples/amqps_bind.c +++ b/examples/amqps_bind.c @@ -41,7 +41,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -52,7 +53,7 @@ int main(int argc, char const * const *argv) { if (argc < 6) { fprintf(stderr, "Usage: amqps_bind host port exchange bindingkey queue " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -90,15 +91,15 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); amqp_queue_bind(conn, 1, - amqp_cstring_bytes(queue), - amqp_cstring_bytes(exchange), - amqp_cstring_bytes(bindingkey), - amqp_empty_table); + amqp_cstring_bytes(queue), + amqp_cstring_bytes(exchange), + amqp_cstring_bytes(bindingkey), + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding"); die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel"); diff --git a/examples/amqps_consumer.c b/examples/amqps_consumer.c index d935c90..c02168a 100644 --- a/examples/amqps_consumer.c +++ b/examples/amqps_consumer.c @@ -66,7 +66,7 @@ static void run(amqp_connection_state_t conn) int countOverInterval = received - previous_received; double intervalRate = countOverInterval / ((now - previous_report_time) / 1000000.0); printf("%d ms: Received %d - %d since last report (%d Hz)\n", - (int)(now - start_time) / 1000, received, countOverInterval, (int) intervalRate); + (int)(now - start_time) / 1000, received, countOverInterval, (int) intervalRate); previous_received = received; previous_report_time = now; @@ -75,18 +75,22 @@ static void run(amqp_connection_state_t conn) amqp_maybe_release_buffers(conn); result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) + if (result < 0) { return; + } - if (frame.frame_type != AMQP_FRAME_METHOD) + if (frame.frame_type != AMQP_FRAME_METHOD) { continue; + } - if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) + if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) { continue; + } result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) + if (result < 0) { return; + } if (frame.frame_type != AMQP_FRAME_HEADER) { fprintf(stderr, "Expected header!"); @@ -98,12 +102,13 @@ static void run(amqp_connection_state_t conn) while (body_received < body_target) { result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) - return; + if (result < 0) { + return; + } if (frame.frame_type != AMQP_FRAME_BODY) { - fprintf(stderr, "Expected body!"); - abort(); + fprintf(stderr, "Expected body!"); + abort(); } body_received += frame.payload.body_fragment.len; @@ -114,7 +119,8 @@ static void run(amqp_connection_state_t conn) } } -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -125,7 +131,7 @@ int main(int argc, char const * const *argv) { if (argc < 3) { fprintf(stderr, "Usage: amqps_consumer host port " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -162,13 +168,13 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); { amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, - amqp_empty_table); + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring queue"); queuename = amqp_bytes_malloc_dup(r->queue); if (queuename.bytes == NULL) { @@ -178,7 +184,7 @@ int main(int argc, char const * const *argv) { } amqp_queue_bind(conn, 1, queuename, amqp_cstring_bytes(exchange), amqp_cstring_bytes(bindingkey), - amqp_empty_table); + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Binding queue"); amqp_basic_consume(conn, 1, queuename, amqp_empty_bytes, 0, 1, 0, amqp_empty_table); diff --git a/examples/amqps_exchange_declare.c b/examples/amqps_exchange_declare.c index c9f2e6c..199c0c5 100644 --- a/examples/amqps_exchange_declare.c +++ b/examples/amqps_exchange_declare.c @@ -41,7 +41,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -51,7 +52,7 @@ int main(int argc, char const * const *argv) { if (argc < 5) { fprintf(stderr, "Usage: amqps_exchange_declare host port exchange " - "exchangetype [cacert.pem [key.pem cert.pem]]\n"); + "exchangetype [cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -88,12 +89,12 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); amqp_exchange_declare(conn, 1, amqp_cstring_bytes(exchange), amqp_cstring_bytes(exchangetype), - 0, 0, amqp_empty_table); + 0, 0, amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring exchange"); die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel"); diff --git a/examples/amqps_listen.c b/examples/amqps_listen.c index 9be9acb..728a343 100644 --- a/examples/amqps_listen.c +++ b/examples/amqps_listen.c @@ -43,7 +43,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -55,7 +56,7 @@ int main(int argc, char const * const *argv) { if (argc < 5) { fprintf(stderr, "Usage: amqps_listen host port exchange bindingkey " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -92,13 +93,13 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); { amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, - amqp_empty_table); + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring queue"); queuename = amqp_bytes_malloc_dup(r->queue); if (queuename.bytes == NULL) { @@ -108,7 +109,7 @@ int main(int argc, char const * const *argv) { } amqp_queue_bind(conn, 1, queuename, amqp_cstring_bytes(exchange), amqp_cstring_bytes(bindingkey), - amqp_empty_table); + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Binding queue"); amqp_basic_consume(conn, 1, queuename, amqp_empty_bytes, 0, 1, 0, amqp_empty_table); @@ -127,35 +128,39 @@ int main(int argc, char const * const *argv) { amqp_maybe_release_buffers(conn); result = amqp_simple_wait_frame(conn, &frame); printf("Result %d\n", result); - if (result < 0) - break; + if (result < 0) { + break; + } printf("Frame type %d, channel %d\n", frame.frame_type, frame.channel); - if (frame.frame_type != AMQP_FRAME_METHOD) - continue; + if (frame.frame_type != AMQP_FRAME_METHOD) { + continue; + } printf("Method %s\n", amqp_method_name(frame.payload.method.id)); - if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) - continue; + if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) { + continue; + } d = (amqp_basic_deliver_t *) frame.payload.method.decoded; printf("Delivery %u, exchange %.*s routingkey %.*s\n", - (unsigned) d->delivery_tag, - (int) d->exchange.len, (char *) d->exchange.bytes, - (int) d->routing_key.len, (char *) d->routing_key.bytes); + (unsigned) d->delivery_tag, + (int) d->exchange.len, (char *) d->exchange.bytes, + (int) d->routing_key.len, (char *) d->routing_key.bytes); result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) - break; + if (result < 0) { + break; + } if (frame.frame_type != AMQP_FRAME_HEADER) { - fprintf(stderr, "Expected header!"); - abort(); + fprintf(stderr, "Expected header!"); + abort(); } p = (amqp_basic_properties_t *) frame.payload.properties.decoded; if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) { - printf("Content-type: %.*s\n", - (int) p->content_type.len, (char *) p->content_type.bytes); + printf("Content-type: %.*s\n", + (int) p->content_type.len, (char *) p->content_type.bytes); } printf("----\n"); @@ -163,26 +168,27 @@ int main(int argc, char const * const *argv) { body_received = 0; while (body_received < body_target) { - result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) - break; + result = amqp_simple_wait_frame(conn, &frame); + if (result < 0) { + break; + } - if (frame.frame_type != AMQP_FRAME_BODY) { - fprintf(stderr, "Expected body!"); - abort(); - } + if (frame.frame_type != AMQP_FRAME_BODY) { + fprintf(stderr, "Expected body!"); + abort(); + } - body_received += frame.payload.body_fragment.len; - assert(body_received <= body_target); + body_received += frame.payload.body_fragment.len; + assert(body_received <= body_target); - amqp_dump(frame.payload.body_fragment.bytes, - frame.payload.body_fragment.len); + amqp_dump(frame.payload.body_fragment.bytes, + frame.payload.body_fragment.len); } if (body_received != body_target) { - /* Can only happen when amqp_simple_wait_frame returns <= 0 */ - /* We break here to close the connection */ - break; + /* Can only happen when amqp_simple_wait_frame returns <= 0 */ + /* We break here to close the connection */ + break; } } } diff --git a/examples/amqps_listenq.c b/examples/amqps_listenq.c index 3296ffe..ff28e24 100644 --- a/examples/amqps_listenq.c +++ b/examples/amqps_listenq.c @@ -43,7 +43,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *queuename; @@ -52,7 +53,7 @@ int main(int argc, char const * const *argv) { if (argc < 4) { fprintf(stderr, "Usage: amqps_listenq host port queuename " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -88,7 +89,7 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); @@ -108,35 +109,39 @@ int main(int argc, char const * const *argv) { amqp_maybe_release_buffers(conn); result = amqp_simple_wait_frame(conn, &frame); printf("Result %d\n", result); - if (result < 0) - break; + if (result < 0) { + break; + } printf("Frame type %d, channel %d\n", frame.frame_type, frame.channel); - if (frame.frame_type != AMQP_FRAME_METHOD) - continue; + if (frame.frame_type != AMQP_FRAME_METHOD) { + continue; + } printf("Method %s\n", amqp_method_name(frame.payload.method.id)); - if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) - continue; + if (frame.payload.method.id != AMQP_BASIC_DELIVER_METHOD) { + continue; + } d = (amqp_basic_deliver_t *) frame.payload.method.decoded; printf("Delivery %u, exchange %.*s routingkey %.*s\n", - (unsigned) d->delivery_tag, - (int) d->exchange.len, (char *) d->exchange.bytes, - (int) d->routing_key.len, (char *) d->routing_key.bytes); + (unsigned) d->delivery_tag, + (int) d->exchange.len, (char *) d->exchange.bytes, + (int) d->routing_key.len, (char *) d->routing_key.bytes); result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) - break; + if (result < 0) { + break; + } if (frame.frame_type != AMQP_FRAME_HEADER) { - fprintf(stderr, "Expected header!"); - abort(); + fprintf(stderr, "Expected header!"); + abort(); } p = (amqp_basic_properties_t *) frame.payload.properties.decoded; if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) { - printf("Content-type: %.*s\n", - (int) p->content_type.len, (char *) p->content_type.bytes); + printf("Content-type: %.*s\n", + (int) p->content_type.len, (char *) p->content_type.bytes); } printf("----\n"); @@ -144,26 +149,27 @@ int main(int argc, char const * const *argv) { body_received = 0; while (body_received < body_target) { - result = amqp_simple_wait_frame(conn, &frame); - if (result < 0) - break; + result = amqp_simple_wait_frame(conn, &frame); + if (result < 0) { + break; + } - if (frame.frame_type != AMQP_FRAME_BODY) { - fprintf(stderr, "Expected body!"); - abort(); - } + if (frame.frame_type != AMQP_FRAME_BODY) { + fprintf(stderr, "Expected body!"); + abort(); + } - body_received += frame.payload.body_fragment.len; - assert(body_received <= body_target); + body_received += frame.payload.body_fragment.len; + assert(body_received <= body_target); - amqp_dump(frame.payload.body_fragment.bytes, - frame.payload.body_fragment.len); + amqp_dump(frame.payload.body_fragment.bytes, + frame.payload.body_fragment.len); } if (body_received != body_target) { - /* Can only happen when amqp_simple_wait_frame returns <= 0 */ - /* We break here to close the connection */ - break; + /* Can only happen when amqp_simple_wait_frame returns <= 0 */ + /* We break here to close the connection */ + break; } amqp_basic_ack(conn, 1, d->delivery_tag, 0); diff --git a/examples/amqps_producer.c b/examples/amqps_producer.c index 04f5ae8..c67f8ca 100644 --- a/examples/amqps_producer.c +++ b/examples/amqps_producer.c @@ -44,9 +44,9 @@ #define SUMMARY_EVERY_US 1000000 static void send_batch(amqp_connection_state_t conn, - char const *queue_name, - int rate_limit, - int message_count) + char const *queue_name, + int rate_limit, + int message_count) { uint64_t start_time = now_microseconds(); int i; @@ -69,20 +69,20 @@ static void send_batch(amqp_connection_state_t conn, uint64_t now = now_microseconds(); die_on_error(amqp_basic_publish(conn, - 1, - amqp_cstring_bytes("amq.direct"), - amqp_cstring_bytes(queue_name), - 0, - 0, - NULL, - message_bytes), - "Publishing"); + 1, + amqp_cstring_bytes("amq.direct"), + amqp_cstring_bytes(queue_name), + 0, + 0, + NULL, + message_bytes), + "Publishing"); sent++; if (now > next_summary_time) { int countOverInterval = sent - previous_sent; double intervalRate = countOverInterval / ((now - previous_report_time) / 1000000.0); printf("%d ms: Sent %d - %d since last report (%d Hz)\n", - (int)(now - start_time) / 1000, sent, countOverInterval, (int) intervalRate); + (int)(now - start_time) / 1000, sent, countOverInterval, (int) intervalRate); previous_sent = sent; previous_report_time = now; @@ -105,7 +105,8 @@ static void send_batch(amqp_connection_state_t conn, } } -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; int rate_limit; @@ -115,7 +116,7 @@ int main(int argc, char const * const *argv) { if (argc < 5) { fprintf(stderr, "Usage: amqps_producer host port rate_limit message_count " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -152,7 +153,7 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); diff --git a/examples/amqps_sendstring.c b/examples/amqps_sendstring.c index 2325778..989e73a 100644 --- a/examples/amqps_sendstring.c +++ b/examples/amqps_sendstring.c @@ -41,7 +41,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -52,7 +53,7 @@ int main(int argc, char const * const *argv) { if (argc < 6) { fprintf(stderr, "Usage: amqps_sendstring host port exchange routingkey " - "messagebody [cacert.pem [key.pem cert.pem]]\n"); + "messagebody [cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -90,7 +91,7 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); @@ -100,14 +101,14 @@ int main(int argc, char const * const *argv) { props.content_type = amqp_cstring_bytes("text/plain"); props.delivery_mode = 2; /* persistent delivery mode */ die_on_error(amqp_basic_publish(conn, - 1, - amqp_cstring_bytes(exchange), - amqp_cstring_bytes(routingkey), - 0, - 0, - &props, - amqp_cstring_bytes(messagebody)), - "Publishing"); + 1, + amqp_cstring_bytes(exchange), + amqp_cstring_bytes(routingkey), + 0, + 0, + &props, + amqp_cstring_bytes(messagebody)), + "Publishing"); } die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel"); diff --git a/examples/amqps_unbind.c b/examples/amqps_unbind.c index a74992a..dfe0f1a 100644 --- a/examples/amqps_unbind.c +++ b/examples/amqps_unbind.c @@ -41,7 +41,8 @@ #include "utils.h" -int main(int argc, char const * const *argv) { +int main(int argc, char const *const *argv) +{ char const *hostname; int port, status; char const *exchange; @@ -52,7 +53,7 @@ int main(int argc, char const * const *argv) { if (argc < 6) { fprintf(stderr, "Usage: amqps_unbind host port exchange bindingkey queue " - "[cacert.pem [key.pem cert.pem]]\n"); + "[cacert.pem [key.pem cert.pem]]\n"); return 1; } @@ -90,15 +91,15 @@ int main(int argc, char const * const *argv) { amqp_set_socket(conn, socket); die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"), - "Logging in"); + "Logging in"); amqp_channel_open(conn, 1); die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel"); amqp_queue_unbind(conn, 1, - amqp_cstring_bytes(queue), - amqp_cstring_bytes(exchange), - amqp_cstring_bytes(bindingkey), - amqp_empty_table); + amqp_cstring_bytes(queue), + amqp_cstring_bytes(exchange), + amqp_cstring_bytes(bindingkey), + amqp_empty_table); die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding"); die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel"); diff --git a/examples/utils.c b/examples/utils.c index 0830738..4b00470 100644 --- a/examples/utils.c +++ b/examples/utils.c @@ -56,7 +56,8 @@ void die(const char *fmt, ...) exit(1); } -void die_on_error(int x, char const *context) { +void die_on_error(int x, char const *context) +{ if (x < 0) { char *errstr = amqp_error_string(-x); fprintf(stderr, "%s: %s\n", context, errstr); -- cgit v1.2.1