Merge amqp_0_9_1 into bug22951 to remove headbug22951

9 files changed, 36 insertions, 40 deletions

diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c
index 697df2a..1f183a5 100644
--- a/examples/amqp_bind.c
+++ b/examples/amqp_bind.c
@@ -99,7 +99,6 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
   return 0;
 }
diff --git a/examples/amqp_consumer.c b/examples/amqp_consumer.c
index a8ed9e3..b1754f5 100644
--- a/examples/amqp_consumer.c
+++ b/examples/amqp_consumer.c
@@ -51,7 +51,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #include <stdint.h>
 #include <amqp.h>
@@ -84,8 +83,8 @@ static void run(amqp_connection_state_t conn)
     if (now > next_summary_time) {
       int countOverInterval = received - previous_received;
       double intervalRate = countOverInterval / ((now - previous_report_time) / 1000000.0);
-      printf("%lld ms: Received %d - %d since last report (%d Hz)\n",
-	     (now - start_time) / 1000, received, countOverInterval, (int) intervalRate);
+      printf("%d ms: Received %d - %d since last report (%d Hz)\n",
+	     (int)(now - start_time) / 1000, received, countOverInterval, (int) intervalRate);
 
       previous_received = received;
       previous_report_time = now;
@@ -94,7 +93,8 @@ static void run(amqp_connection_state_t conn)
 
     amqp_maybe_release_buffers(conn);
     result = amqp_simple_wait_frame(conn, &frame);
-    if (result <= 0) return;
+    if (result < 0)
+      return;
 
     if (frame.frame_type != AMQP_FRAME_METHOD)
       continue;
@@ -103,7 +103,9 @@ static void run(amqp_connection_state_t conn)
       continue;
 
     result = amqp_simple_wait_frame(conn, &frame);
-    if (result <= 0) return;
+    if (result < 0)
+      return;
+    
     if (frame.frame_type != AMQP_FRAME_HEADER) {
       fprintf(stderr, "Expected header!");
       abort();
@@ -114,7 +116,8 @@ 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!");
@@ -165,7 +168,8 @@ int main(int argc, char const * const *argv) {
     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");
+      fprintf(stderr, "Out of memory while copying queue name");
+      return 1;
     }
   }
 
@@ -180,8 +184,7 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
 
   return 0;
 }
diff --git a/examples/amqp_exchange_declare.c b/examples/amqp_exchange_declare.c
index 14bc163..e77ac52 100644
--- a/examples/amqp_exchange_declare.c
+++ b/examples/amqp_exchange_declare.c
@@ -89,12 +89,11 @@ int main(int argc, char const * const *argv) {
   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);
+			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");
   die_on_amqp_error(amqp_connection_close(conn, AMQP_REPLY_SUCCESS), "Closing connection");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
   return 0;
 }
diff --git a/examples/amqp_listen.c b/examples/amqp_listen.c
index 448ced1..f208652 100644
--- a/examples/amqp_listen.c
+++ b/examples/amqp_listen.c
@@ -51,7 +51,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #include <stdint.h>
 #include <amqp.h>
@@ -101,7 +100,8 @@ int main(int argc, char const * const *argv) {
     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");
+      fprintf(stderr, "Out of memory while copying queue name");
+      return 1;
     }
   }
 
@@ -125,7 +125,7 @@ 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)
+      if (result < 0)
 	break;
 
       printf("Frame type %d, channel %d\n", frame.frame_type, frame.channel);
@@ -143,7 +143,7 @@ int main(int argc, char const * const *argv) {
 	     (int) d->routing_key.len, (char *) d->routing_key.bytes);
 
       result = amqp_simple_wait_frame(conn, &frame);
-      if (result <= 0)
+      if (result < 0)
 	break;
 
       if (frame.frame_type != AMQP_FRAME_HEADER) {
@@ -162,7 +162,7 @@ int main(int argc, char const * const *argv) {
 
       while (body_received < body_target) {
 	result = amqp_simple_wait_frame(conn, &frame);
-	if (result <= 0)
+	if (result < 0)
 	  break;
 
 	if (frame.frame_type != AMQP_FRAME_BODY) {
@@ -187,8 +187,7 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
 
   return 0;
 }
diff --git a/examples/amqp_listenq.c b/examples/amqp_listenq.c
index 0057826..98c389f 100644
--- a/examples/amqp_listenq.c
+++ b/examples/amqp_listenq.c
@@ -51,7 +51,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 
 #include <stdint.h>
 #include <amqp.h>
@@ -107,7 +106,7 @@ 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)
+      if (result < 0)
 	break;
 
       printf("Frame type %d, channel %d\n", frame.frame_type, frame.channel);
@@ -125,7 +124,7 @@ int main(int argc, char const * const *argv) {
 	     (int) d->routing_key.len, (char *) d->routing_key.bytes);
 
       result = amqp_simple_wait_frame(conn, &frame);
-      if (result <= 0)
+      if (result < 0)
 	break;
 
       if (frame.frame_type != AMQP_FRAME_HEADER) {
@@ -144,7 +143,7 @@ int main(int argc, char const * const *argv) {
 
       while (body_received < body_target) {
 	result = amqp_simple_wait_frame(conn, &frame);
-	if (result <= 0)
+	if (result < 0)
 	  break;
 
 	if (frame.frame_type != AMQP_FRAME_BODY) {
@@ -171,8 +170,7 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
 
   return 0;
 }
diff --git a/examples/amqp_producer.c b/examples/amqp_producer.c
index ac6eebc..b83e030 100644
--- a/examples/amqp_producer.c
+++ b/examples/amqp_producer.c
@@ -95,8 +95,8 @@ static void send_batch(amqp_connection_state_t conn,
     if (now > next_summary_time) {
       int countOverInterval = sent - previous_sent;
       double intervalRate = countOverInterval / ((now - previous_report_time) / 1000000.0);
-      printf("%lld ms: Sent %d - %d since last report (%d Hz)\n",
-	     (now - start_time) / 1000, sent, countOverInterval, (int) intervalRate);
+      printf("%d ms: Sent %d - %d since last report (%d Hz)\n",
+	     (int)(now - start_time) / 1000, sent, countOverInterval, (int) intervalRate);
 
       previous_sent = sent;
       previous_report_time = now;
@@ -111,10 +111,10 @@ static void send_batch(amqp_connection_state_t conn,
 
   {
     long long stop_time = now_microseconds();
-    long long total_delta = stop_time - start_time;
+    int total_delta = stop_time - start_time;
 
     printf("PRODUCER - Message count: %d\n", message_count);
-    printf("Total time, milliseconds: %lld\n", total_delta / 1000);
+    printf("Total time, milliseconds: %d\n", total_delta / 1000);
     printf("Overall messages-per-second: %g\n", (message_count / (total_delta / 1000000.0)));
   }
 }
@@ -151,7 +151,6 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
   return 0;
 }
diff --git a/examples/amqp_sendstring.c b/examples/amqp_sendstring.c
index 6e8e0b6..ccd3866 100644
--- a/examples/amqp_sendstring.c
+++ b/examples/amqp_sendstring.c
@@ -108,7 +108,6 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
   return 0;
 }
diff --git a/examples/amqp_unbind.c b/examples/amqp_unbind.c
index 27df916..4b92e12 100644
--- a/examples/amqp_unbind.c
+++ b/examples/amqp_unbind.c
@@ -99,7 +99,6 @@ int main(int argc, char const * const *argv) {
 
   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");
-  amqp_destroy_connection(conn);
-  die_on_error(close(sockfd), "Closing socket");
+  die_on_error(amqp_destroy_connection(conn), "Ending connection");
   return 0;
 }
diff --git a/examples/example_utils.c b/examples/example_utils.c
index 628572c..48f21f9 100644
--- a/examples/example_utils.c
+++ b/examples/example_utils.c
@@ -61,7 +61,9 @@
 
 void die_on_error(int x, char const *context) {
   if (x < 0) {
-    fprintf(stderr, "%s: %s\n", context, strerror(-x));
+    char *errstr = amqp_error_string(-x);
+    fprintf(stderr, "%s: %s\n", context, errstr);
+    free(errstr);
     exit(1);
   }
 }
@@ -76,8 +78,7 @@ void die_on_amqp_error(amqp_rpc_reply_t x, char const *context) {
       break;
 
     case AMQP_RESPONSE_LIBRARY_EXCEPTION:
-      fprintf(stderr, "%s: %s\n", context,
-	      x.library_errno ? strerror(x.library_errno) : "(end-of-stream)");
+      fprintf(stderr, "%s: %s\n", context, amqp_error_string(x.library_error));
       break;
 
     case AMQP_RESPONSE_SERVER_EXCEPTION: