Remove amqp_rpc_reply global variable, making it instead state-local

and accessible only through amqp_get_rpc_reply(). Add a better comment
on amqp_get_rpc_reply() to be a little clearer about when it's
inappropriate to use it.

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/amqp_consumer.c b/examples/amqp_consumer.c
index 230a94e..f93ddf3 100644
--- a/examples/amqp_consumer.c
+++ b/examples/amqp_consumer.c
@@ -107,12 +107,12 @@ int main(int argc, char const * const *argv) {
   die_on_amqp_error(amqp_login(conn, "/", 0, 131072, 0, AMQP_SASL_METHOD_PLAIN, "guest", "guest"),
 		    "Logging in");
   amqp_channel_open(conn, 1);
-  die_on_amqp_error(amqp_rpc_reply, "Opening channel");
+  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);
-    die_on_amqp_error(amqp_rpc_reply, "Declaring queue");
+    die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring queue");
     queuename = amqp_bytes_malloc_dup(r->queue);
     if (queuename.bytes == NULL) {
       die_on_error(-ENOMEM, "Copying queue name");
@@ -121,10 +121,10 @@ 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);
-  die_on_amqp_error(amqp_rpc_reply, "Binding queue");
+  die_on_amqp_error(amqp_get_rpc_reply(conn), "Binding queue");
 
   amqp_basic_consume(conn, 1, queuename, AMQP_EMPTY_BYTES, 0, 1, 0);
-  die_on_amqp_error(amqp_rpc_reply, "Consuming");
+  die_on_amqp_error(amqp_get_rpc_reply(conn), "Consuming");
 
   run(conn);