Skip to content

Commit d3bbdb6

Browse files
groverbauvipy
authored andcommitted
modules: _librabbit: connection: fix warnings that get flagged as errors in latest clang
1 parent 6a18b85 commit d3bbdb6

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Modules/_librabbitmq/connection.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ PyObject *PyRabbitMQExc_ConnectionError;
2828
PyObject *PyRabbitMQExc_ChannelError;
2929
PyObject *PyRabbitMQ_socket_timeout;
3030

31+
extern int amqp_simple_wait_frame_on_channel(amqp_connection_state_t, amqp_channel_t, amqp_frame_t *);
3132

3233
_PYRMQ_INLINE amqp_table_entry_t*
3334
AMQTable_AddEntry(amqp_table_t*, amqp_bytes_t);
@@ -381,7 +382,7 @@ PyIter_ToAMQArray(amqp_connection_state_t conn, PyObject *src, amqp_pool_t *pool
381382
dst.num_entries = 0;
382383
dst.entries = amqp_pool_alloc(pool, size * sizeof(amqp_field_value_t));
383384

384-
while (item = PyIter_Next(iterator)) {
385+
while ((item = PyIter_Next(iterator))) {
385386
if (item == Py_None) {
386387
/* None */
387388
AMQArray_SetNilValue(&dst);
@@ -1206,12 +1207,11 @@ PyRabbitMQ_Connection_connect(PyRabbitMQ_Connection *self)
12061207
static PyObject*
12071208
PyRabbitMQ_Connection_close(PyRabbitMQ_Connection *self)
12081209
{
1209-
amqp_rpc_reply_t reply;
12101210
if (self->connected) {
12111211
self->connected = 0;
12121212

12131213
Py_BEGIN_ALLOW_THREADS
1214-
reply = amqp_connection_close(self->conn, AMQP_REPLY_SUCCESS);
1214+
amqp_connection_close(self->conn, AMQP_REPLY_SUCCESS);
12151215
amqp_destroy_connection(self->conn);
12161216
self->sockfd = 0;
12171217
Py_END_ALLOW_THREADS
@@ -2080,7 +2080,6 @@ PyRabbitMQ_Connection_basic_cancel(PyRabbitMQ_Connection *self,
20802080
PyObject *consumer_tag = NULL;
20812081
unsigned int channel = 0;
20822082

2083-
amqp_basic_cancel_ok_t *ok;
20842083
amqp_rpc_reply_t reply;
20852084

20862085
pyobject_array_t pyobj_array = {0};
@@ -2093,7 +2092,7 @@ PyRabbitMQ_Connection_basic_cancel(PyRabbitMQ_Connection *self,
20932092
if ((consumer_tag = PyObjectArray_Maybe_Unicode(consumer_tag, &pyobj_array)) == NULL) goto bail;
20942093

20952094
Py_BEGIN_ALLOW_THREADS;
2096-
ok = amqp_basic_cancel(self->conn, channel,
2095+
amqp_basic_cancel(self->conn, channel,
20972096
PyString_AS_AMQBYTES(consumer_tag));
20982097
reply = amqp_get_rpc_reply(self->conn);
20992098
amqp_maybe_release_buffers_on_channel(self->conn, channel);
@@ -2217,7 +2216,6 @@ PyRabbitMQ_Connection_flow(PyRabbitMQ_Connection *self,
22172216
unsigned int channel = 0;
22182217
unsigned int active = 1;
22192218

2220-
amqp_channel_flow_ok_t *ok;
22212219
amqp_rpc_reply_t reply;
22222220

22232221
if (PyRabbitMQ_Not_Connected(self))
@@ -2227,7 +2225,7 @@ PyRabbitMQ_Connection_flow(PyRabbitMQ_Connection *self,
22272225
goto bail;
22282226

22292227
Py_BEGIN_ALLOW_THREADS;
2230-
ok = amqp_channel_flow(self->conn, channel, (amqp_boolean_t)active);
2228+
amqp_channel_flow(self->conn, channel, (amqp_boolean_t)active);
22312229
reply = amqp_get_rpc_reply(self->conn);
22322230
amqp_maybe_release_buffers_on_channel(self->conn, channel);
22332231
Py_END_ALLOW_THREADS;
@@ -2250,7 +2248,6 @@ PyRabbitMQ_Connection_basic_recover(PyRabbitMQ_Connection *self,
22502248
unsigned int channel = 0;
22512249
unsigned int requeue = 0;
22522250

2253-
amqp_basic_recover_ok_t *ok;
22542251
amqp_rpc_reply_t reply;
22552252

22562253
if (PyRabbitMQ_Not_Connected(self))
@@ -2260,7 +2257,7 @@ PyRabbitMQ_Connection_basic_recover(PyRabbitMQ_Connection *self,
22602257
goto bail;
22612258

22622259
Py_BEGIN_ALLOW_THREADS;
2263-
ok = amqp_basic_recover(self->conn, channel, (amqp_boolean_t)requeue);
2260+
amqp_basic_recover(self->conn, channel, (amqp_boolean_t)requeue);
22642261
reply = amqp_get_rpc_reply(self->conn);
22652262
amqp_maybe_release_buffers_on_channel(self->conn, channel);
22662263
Py_END_ALLOW_THREADS;

0 commit comments

Comments
 (0)