Skip to content

gnu90-compatibility #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 2, 2023
Merged

gnu90-compatibility #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08b0473
First iteration
mahajanadhitya Jan 10, 2023
b4db862
Merge branch 'master' into feature/gnu90-compatibility
mahajanadhitya Feb 1, 2023
5146d4a
Merge branch 'master' into feature/gnu90-compatibility
emasab Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/confluent_kafka/src/Consumer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,8 @@ static PyObject *Consumer_poll (Handle *self, PyObject *args,

msgobj = Message_new0(self, rkm);
#ifdef RD_KAFKA_V_HEADERS
// Have to detach headers outside Message_new0 because it declares the
// rk message as a const
/** Have to detach headers outside Message_new0 because it declares the
* rk message as a const */
rd_kafka_message_detach_headers(rkm, &((Message *)msgobj)->c_headers);
#endif
rd_kafka_message_destroy(rkm);
Expand Down Expand Up @@ -1062,8 +1062,8 @@ static PyObject *Consumer_consume (Handle *self, PyObject *args,
for (i = 0; i < n; i++) {
PyObject *msgobj = Message_new0(self, rkmessages[i]);
#ifdef RD_KAFKA_V_HEADERS
// Have to detach headers outside Message_new0 because it declares the
// rk message as a const
/** Have to detach headers outside Message_new0 because it declares the
* rk message as a const */
rd_kafka_message_detach_headers(rkmessages[i], &((Message *)msgobj)->c_headers);
#endif
PyList_SET_ITEM(msglist, i, msgobj);
Expand Down
7 changes: 4 additions & 3 deletions src/confluent_kafka/src/confluent_kafka.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ PyObject *c_headers_to_py (rd_kafka_headers_t *headers) {

while (!rd_kafka_header_get_all(headers, idx++,
&header_key, &header_value, &header_value_size)) {
// Create one (key, value) tuple for each header
/* Create one (key, value) tuple for each header */
PyObject *header_tuple = PyTuple_New(2);
PyTuple_SetItem(header_tuple, 0,
cfl_PyUnistr(_FromString(header_key))
Expand Down Expand Up @@ -1694,7 +1694,8 @@ static void oauth_cb (rd_kafka_t *rk, const char *oauthbearer_config,
sizeof(err_msg));
Py_DECREF(result);
if (rd_extensions) {
for(int i = 0; i < rd_extensions_size; i++) {
int i;
for(i = 0; i < rd_extensions_size; i++) {
free(rd_extensions[i]);
}
free(rd_extensions);
Expand Down Expand Up @@ -2739,7 +2740,7 @@ static char *KafkaError_add_errs (PyObject *dict, const char *origdoc) {

_PRINT("\n");

return doc; // FIXME: leak
return doc; /* FIXME: leak */
}


Expand Down