summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChoi Geonu <6566gun@gmail.com>2017-10-24 13:47:12 +0900
committerChoi Geonu <6566gun@gmail.com>2017-10-24 13:47:12 +0900
commitc6f139a6accf30e6196d6603bf20bc2f6c63d99b (patch)
treeca668129420d6dba830f0b41b67b28ae5343e665
parent3ec5ded981c5e404a0a2a6ad53bf4db36f28da94 (diff)
downloadlibrabbitmq-c6f139a6accf30e6196d6603bf20bc2f6c63d99b.tar.gz
AMQP_EMPTY_* were deprecated since v0.1
-rw-r--r--Modules/_librabbitmq/connection.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/Modules/_librabbitmq/connection.c b/Modules/_librabbitmq/connection.c
index bcf85fe..485734e 100644
--- a/Modules/_librabbitmq/connection.c
+++ b/Modules/_librabbitmq/connection.c
@@ -256,7 +256,7 @@ PyDict_ToAMQTable(amqp_connection_state_t conn, PyObject *src, amqp_pool_t *pool
uint64_t clong_value = 0;
double cdouble_value = 0.0;
int is_unicode = 0;
- amqp_table_t dst = AMQP_EMPTY_TABLE;
+ amqp_table_t dst = amqp_empty_table;
size = PyDict_Size(src);
@@ -340,7 +340,7 @@ PyDict_ToAMQTable(amqp_connection_state_t conn, PyObject *src, amqp_pool_t *pool
return dst;
error:
assert(PyErr_Occurred());
- return AMQP_EMPTY_TABLE;
+ return amqp_empty_table;
}
static amqp_array_t
@@ -349,7 +349,7 @@ PyIter_ToAMQArray(amqp_connection_state_t conn, PyObject *src, amqp_pool_t *pool
Py_ssize_t pos = 0;
uint64_t clong_value = 0;
int is_unicode = 0;
- amqp_array_t dst = AMQP_EMPTY_ARRAY;
+ amqp_array_t dst = amqp_empty_array;
Py_ssize_t size = PySequence_Size(src);
if (size == -1) return dst;
@@ -684,7 +684,7 @@ PyDict_to_basic_properties(PyObject *p,
amqp_pool_t *pool)
{
PyObject *value = NULL;
- props->headers = AMQP_EMPTY_TABLE;
+ props->headers = amqp_empty_table;
props->_flags = AMQP_BASIC_HEADERS_FLAG;
if ((value = PyDict_GetItemString(p, "content_type")) != NULL) {
@@ -1461,7 +1461,7 @@ PyRabbitMQ_Connection_queue_bind(PyRabbitMQ_Connection *self,
PyObject *routing_key = NULL;
PyObject *arguments = NULL;
- amqp_table_t bargs = AMQP_EMPTY_TABLE;
+ amqp_table_t bargs = amqp_empty_table;
amqp_pool_t *channel_pool = NULL;
amqp_rpc_reply_t reply;
@@ -1516,7 +1516,7 @@ PyRabbitMQ_Connection_queue_unbind(PyRabbitMQ_Connection *self,
PyObject *routing_key = NULL;
PyObject *arguments = NULL;
- amqp_table_t uargs = AMQP_EMPTY_TABLE;
+ amqp_table_t uargs = amqp_empty_table;
amqp_pool_t *channel_pool = NULL;
amqp_rpc_reply_t reply;
@@ -1618,7 +1618,7 @@ PyRabbitMQ_Connection_queue_declare(PyRabbitMQ_Connection *self,
amqp_queue_declare_ok_t *ok;
amqp_rpc_reply_t reply;
amqp_pool_t *channel_pool = NULL;
- amqp_table_t qargs = AMQP_EMPTY_TABLE;
+ amqp_table_t qargs = amqp_empty_table;
PyObject *ret = NULL;
if (PyRabbitMQ_Not_Connected(self))
@@ -1718,7 +1718,7 @@ PyRabbitMQ_Connection_exchange_declare(PyRabbitMQ_Connection *self,
* as it has been decided that it's not that useful after all. */
unsigned int auto_delete = 0;
- amqp_table_t eargs = AMQP_EMPTY_TABLE;
+ amqp_table_t eargs = amqp_empty_table;
amqp_pool_t *channel_pool = NULL;
amqp_rpc_reply_t reply;
@@ -1984,7 +1984,7 @@ PyRabbitMQ_Connection_basic_consume(PyRabbitMQ_Connection *self,
amqp_basic_consume_ok_t *ok;
amqp_rpc_reply_t reply;
amqp_pool_t *channel_pool = NULL;
- amqp_table_t cargs = AMQP_EMPTY_TABLE;
+ amqp_table_t cargs = amqp_empty_table;
if (PyRabbitMQ_Not_Connected(self))
goto bail;