Merge pull request #541 from Barenboim/master

fix kafka warnings on clang
sogou · Aug 24, 2021 · b995150 · b995150
2 parents 5b84728 + b55e318
commit b995150
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/factory/KafkaTaskImpl.cc b/src/factory/KafkaTaskImpl.cc
@@ -115,10 +115,11 @@ CommMessageOut *__ComplexKafkaTask::message_out()
 	if (seqid == 0)
 	{
 		KafkaConnectionInfo *conn_info = new KafkaConnectionInfo;
-		this->get_connection()->set_context(conn_info, std::move([](void *ctx) {
-					delete (KafkaConnectionInfo *)ctx;
-				}));
+
 		this->get_req()->set_api(&conn_info->api);
+		this->get_connection()->set_context(conn_info, [](void *ctx) {
+			delete (KafkaConnectionInfo *)ctx;
+		});
 
 		if (!this->get_req()->get_config()->get_broker_version())
 		{

diff --git a/src/protocol/KafkaMessage.cc b/src/protocol/KafkaMessage.cc
@@ -3819,7 +3819,8 @@ int KafkaResponse::append(const void *buf, size_t *size)
 				if (strncasecmp(this->config.get_sasl_mech(), "SCRAM", 5) == 0)
 				{
 					this->clear_buf();
-					if (this->sasl->scram.state != -1)
+					if (this->sasl->scram.state !=
+							KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED)
 						ret = this->handle_sasl_continue();
 					else
 						this->sasl->status = 1;

diff --git a/src/protocol/kafka_parser.c b/src/protocol/kafka_parser.c
@@ -1111,7 +1111,7 @@ static int kafka_sasl_scram_recv(const char *buf, size_t len, void *p, void *q)
 
 	case KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE:
 		ret = scram_handle_server_final_message(buf, len, conf, sasl);
-		sasl->scram.state = -1;
+		sasl->scram.state = KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED;
 		break;
 
 	default:

diff --git a/src/protocol/kafka_parser.h b/src/protocol/kafka_parser.h
@@ -226,18 +226,21 @@ typedef struct __kafka_parser
 	size_t hsize;
 } kafka_parser_t;
 
+enum __kafka_scram_state
+{
+	KAFKA_SASL_SCRAM_STATE_CLIENT_FIRST_MESSAGE,
+	KAFKA_SASL_SCRAM_STATE_SERVER_FIRST_MESSAGE,
+	KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE,
+	KAFKA_SASL_SCRAM_STATE_CLIENT_FINISHED,
+};
+
 typedef struct __kafka_scram
 {
 	const void *evp;
 	unsigned char *(*scram_h)(const unsigned char *d, size_t n,
 							  unsigned char *md);
 	size_t scram_h_size;
-	enum
-	{
-		KAFKA_SASL_SCRAM_STATE_CLIENT_FIRST_MESSAGE,
-		KAFKA_SASL_SCRAM_STATE_SERVER_FIRST_MESSAGE,
-		KAFKA_SASL_SCRAM_STATE_CLIENT_FINAL_MESSAGE,
-	} state;
+	enum __kafka_scram_state state;
 	struct iovec cnonce;
 	struct iovec first_msg;
 	struct iovec server_signature_b64;