Generate API functions corresponding to most synchronous methods

There's a lot of boilerplate code in amqp_api.c for API functions
corresponding to synchronous AMQP methods.  And some of the functions
that should be there are missing (e.g. basic.qos, basic.cancel).

Instead, we can generate these functions from the protocol definition,
plus a little information to describe where the function arguments do
not reflect all of the method fields.

1 files changed, 0 insertions, 232 deletions

diff --git a/librabbitmq/amqp_api.c b/librabbitmq/amqp_api.c
index bf19761..456987d 100644
--- a/librabbitmq/amqp_api.c
+++ b/librabbitmq/amqp_api.c
@@ -119,23 +119,6 @@ const amqp_array_t amqp_empty_array = { 0, NULL };
    ? (replytype *) state->most_recent_api_result.reply.decoded		\
    : NULL)
 
-amqp_channel_open_ok_t *amqp_channel_open(amqp_connection_state_t state,
-					  amqp_channel_t channel)
-{
-  amqp_method_number_t replies[2] = { AMQP_CHANNEL_OPEN_OK_METHOD, 0};
-  amqp_channel_open_t req;
-  req.out_of_band.bytes = NULL;
-  req.out_of_band.len = 0;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_CHANNEL_OPEN_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
 int amqp_basic_publish(amqp_connection_state_t state,
 		       amqp_channel_t channel,
 		       amqp_bytes_t exchange,
@@ -238,162 +221,6 @@ amqp_rpc_reply_t amqp_connection_close(amqp_connection_state_t state,
 			 replies, &req);
 }
 
-amqp_exchange_declare_ok_t *amqp_exchange_declare(amqp_connection_state_t state,
-						  amqp_channel_t channel,
-						  amqp_bytes_t exchange,
-						  amqp_bytes_t type,
-						  amqp_boolean_t passive,
-						  amqp_boolean_t durable,
-						  amqp_table_t arguments)
-{
-  amqp_method_number_t replies[2] = { AMQP_EXCHANGE_DECLARE_OK_METHOD, 0};
-  amqp_exchange_declare_t req;
-  req.exchange = exchange;
-  req.type = type;
-  req.passive = passive;
-  req.durable = durable;
-  req.auto_delete = 0;
-  req.internal = 0;
-  req.nowait = 0;
-  req.arguments = arguments;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_EXCHANGE_DECLARE_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_queue_declare_ok_t *amqp_queue_declare(amqp_connection_state_t state,
-					    amqp_channel_t channel,
-					    amqp_bytes_t queue,
-					    amqp_boolean_t passive,
-					    amqp_boolean_t durable,
-					    amqp_boolean_t exclusive,
-					    amqp_boolean_t auto_delete,
-					    amqp_table_t arguments)
-{
-  amqp_method_number_t replies[2] = { AMQP_QUEUE_DECLARE_OK_METHOD, 0};
-  amqp_queue_declare_t req;
-  req.queue = queue;
-  req.passive = passive;
-  req.durable = durable;
-  req.exclusive = exclusive;
-  req.auto_delete = auto_delete;
-  req.nowait = 0;
-  req.arguments = arguments;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_QUEUE_DECLARE_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_queue_delete_ok_t *amqp_queue_delete(amqp_connection_state_t state,
-					  amqp_channel_t channel,
-					  amqp_bytes_t queue,
-					  amqp_boolean_t if_unused,
-					  amqp_boolean_t if_empty)
-{
-  amqp_method_number_t replies[2] = { AMQP_QUEUE_DELETE_OK_METHOD, 0};
-  amqp_queue_delete_t req;
-  req.queue = queue;
-  req.if_unused = if_unused;
-  req.if_empty = if_empty;
-  req.nowait = 0;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_QUEUE_DELETE_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_queue_bind_ok_t *amqp_queue_bind(amqp_connection_state_t state,
-				      amqp_channel_t channel,
-				      amqp_bytes_t queue,
-				      amqp_bytes_t exchange,
-				      amqp_bytes_t routing_key,
-				      amqp_table_t arguments)
-{
-  amqp_method_number_t replies[2] = { AMQP_QUEUE_BIND_OK_METHOD, 0};
-  amqp_queue_bind_t req;
-  req.ticket = 0;
-  req.queue = queue;
-  req.exchange = exchange;
-  req.routing_key = routing_key;
-  req.nowait = 0;
-  req.arguments = arguments;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_QUEUE_BIND_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_queue_unbind_ok_t *amqp_queue_unbind(amqp_connection_state_t state,
-					  amqp_channel_t channel,
-					  amqp_bytes_t queue,
-					  amqp_bytes_t exchange,
-					  amqp_bytes_t routing_key,
-					  amqp_table_t arguments)
-{
-  amqp_method_number_t replies[2] = { AMQP_QUEUE_UNBIND_OK_METHOD, 0};
-  amqp_queue_unbind_t req;
-  req.ticket = 0;
-  req.queue = queue;
-  req.exchange = exchange;
-  req.routing_key = routing_key;
-  req.arguments = arguments;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_QUEUE_UNBIND_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_basic_consume_ok_t *amqp_basic_consume(amqp_connection_state_t state,
-					    amqp_channel_t channel,
-					    amqp_bytes_t queue,
-					    amqp_bytes_t consumer_tag,
-					    amqp_boolean_t no_local,
-					    amqp_boolean_t no_ack,
-					    amqp_boolean_t exclusive,
-					    amqp_table_t filter)
-{
-  amqp_method_number_t replies[2] = { AMQP_BASIC_CONSUME_OK_METHOD, 0};
-  amqp_basic_consume_t req;
-  req.ticket = 0;
-  req.queue = queue;
-  req.consumer_tag = consumer_tag;
-  req.no_local = no_local;
-  req.no_ack = no_ack;
-  req.exclusive = exclusive;
-  req.nowait = 0;
-  req.arguments = filter;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_BASIC_CONSUME_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
 int amqp_basic_ack(amqp_connection_state_t state,
 		   amqp_channel_t channel,
 		   uint64_t delivery_tag,
@@ -405,26 +232,6 @@ int amqp_basic_ack(amqp_connection_state_t state,
   return amqp_send_method(state, channel, AMQP_BASIC_ACK_METHOD, &m);
 }
 
-amqp_queue_purge_ok_t *amqp_queue_purge(amqp_connection_state_t state,
-					amqp_channel_t channel,
-					amqp_bytes_t queue,
-					amqp_boolean_t no_wait)
-{
-  amqp_method_number_t replies[2] = { AMQP_QUEUE_PURGE_OK_METHOD, 0};
-  amqp_queue_purge_t req;
-  req.ticket = 0;
-  req.queue = queue;
-  req.nowait = 0;
-
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_QUEUE_PURGE_METHOD,
-						  replies, &req);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
 amqp_rpc_reply_t amqp_basic_get(amqp_connection_state_t state,
 				amqp_channel_t channel,
 				amqp_bytes_t queue,
@@ -444,45 +251,6 @@ amqp_rpc_reply_t amqp_basic_get(amqp_connection_state_t state,
   return state->most_recent_api_result;
 }
 
-amqp_tx_select_ok_t *amqp_tx_select(amqp_connection_state_t state,
-				    amqp_channel_t channel)
-{
-  amqp_method_number_t replies[2] = { AMQP_TX_SELECT_OK_METHOD, 0};
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_TX_SELECT_METHOD,
-						  replies, NULL);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_tx_commit_ok_t *amqp_tx_commit(amqp_connection_state_t state,
-				    amqp_channel_t channel)
-{
-  amqp_method_number_t replies[2] = { AMQP_TX_COMMIT_OK_METHOD, 0};
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_TX_COMMIT_METHOD,
-						  replies, NULL);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
-amqp_tx_rollback_ok_t *amqp_tx_rollback(amqp_connection_state_t state,
-					amqp_channel_t channel)
-{
-  amqp_method_number_t replies[2] = { AMQP_TX_ROLLBACK_OK_METHOD, 0};
-  state->most_recent_api_result = amqp_simple_rpc(state, channel,
-						  AMQP_TX_ROLLBACK_METHOD,
-						  replies, NULL);
-  if (state->most_recent_api_result.reply_type == AMQP_RESPONSE_NORMAL)
-    return state->most_recent_api_result.reply.decoded;
-  else
-    return NULL;
-}
-
 amqp_rpc_reply_t amqp_get_rpc_reply(amqp_connection_state_t state)
 {
   return state->most_recent_api_result;