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.

8 files changed, 18 insertions, 18 deletions

diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c
index afbfed9..fa3f907 100644
--- a/examples/amqp_bind.c
+++ b/examples/amqp_bind.c
@@ -38,14 +38,14 @@ 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_bind(conn, 1,
 		  amqp_cstring_bytes(queue),
 		  amqp_cstring_bytes(exchange),
 		  amqp_cstring_bytes(bindingkey),
 		  AMQP_EMPTY_TABLE);
-  die_on_amqp_error(amqp_rpc_reply, "Unbinding");
+  die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding");
 
   die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel");
   die_on_amqp_error(amqp_connection_close(conn, AMQP_REPLY_SUCCESS), "Closing connection");
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);
 
diff --git a/examples/amqp_exchange_declare.c b/examples/amqp_exchange_declare.c
index 02884e8..d0d456c 100644
--- a/examples/amqp_exchange_declare.c
+++ b/examples/amqp_exchange_declare.c
@@ -36,11 +36,11 @@ 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_exchange_declare(conn, 1, amqp_cstring_bytes(exchange), amqp_cstring_bytes(exchangetype),
 			0, 0, 0, AMQP_EMPTY_TABLE);
-  die_on_amqp_error(amqp_rpc_reply, "Declaring exchange");
+  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");
   die_on_amqp_error(amqp_connection_close(conn, AMQP_REPLY_SUCCESS), "Closing connection");
diff --git a/examples/amqp_listen.c b/examples/amqp_listen.c
index d39e4b4..e487255 100644
--- a/examples/amqp_listen.c
+++ b/examples/amqp_listen.c
@@ -43,12 +43,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");
@@ -57,10 +57,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");
 
   {
     amqp_frame_t frame;
diff --git a/examples/amqp_listenq.c b/examples/amqp_listenq.c
index b6d37fc..2478127 100644
--- a/examples/amqp_listenq.c
+++ b/examples/amqp_listenq.c
@@ -39,10 +39,10 @@ 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_basic_consume(conn, 1, amqp_cstring_bytes(queuename), AMQP_EMPTY_BYTES, 0, 0, 0);
-  die_on_amqp_error(amqp_rpc_reply, "Consuming");
+  die_on_amqp_error(amqp_get_rpc_reply(conn), "Consuming");
 
   {
     amqp_frame_t frame;
diff --git a/examples/amqp_producer.c b/examples/amqp_producer.c
index a60cb3e..e0b8079 100644
--- a/examples/amqp_producer.c
+++ b/examples/amqp_producer.c
@@ -95,7 +95,7 @@ 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");
 
   send_batch(conn, "test queue", rate_limit, message_count);
 
diff --git a/examples/amqp_sendstring.c b/examples/amqp_sendstring.c
index a321f52..e512ef0 100644
--- a/examples/amqp_sendstring.c
+++ b/examples/amqp_sendstring.c
@@ -38,7 +38,7 @@ 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_basic_properties_t props;
diff --git a/examples/amqp_unbind.c b/examples/amqp_unbind.c
index 9a9a35c..e033702 100644
--- a/examples/amqp_unbind.c
+++ b/examples/amqp_unbind.c
@@ -38,14 +38,14 @@ 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_unbind(conn, 1,
 		    amqp_cstring_bytes(queue),
 		    amqp_cstring_bytes(exchange),
 		    amqp_cstring_bytes(bindingkey),
 		    AMQP_EMPTY_TABLE);
-  die_on_amqp_error(amqp_rpc_reply, "Unbinding");
+  die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding");
 
   die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel");
   die_on_amqp_error(amqp_connection_close(conn, AMQP_REPLY_SUCCESS), "Closing connection");