Upgrade to clang-format-14

.semaphore/semaphore.yml

@@ -73,13 +73,13 @@ blocks:
     task:
       agent:
         machine:
-          type: s1-prod-ubuntu20-04-amd64-2
+          type: s1-prod-ubuntu22-04-amd64-2
       jobs:
         - name: 'Style check'
           commands:
-            - sudo apt install -y clang-format-10 python3 python3-pip python3-setuptools
+            - sudo apt install -y clang-format-14 python3 python3-pip python3-setuptools
             - python3 -m pip install -r packaging/tools/requirements.txt
-            - CLANG_FORMAT=clang-format-10 make style-check
+            - CLANG_FORMAT=clang-format-14 make style-check
 
 
   - name: 'Build documentation'

examples/incremental_alter_configs.c

@@ -183,11 +183,9 @@ cmd_incremental_alter_configs(rd_kafka_conf_t *conf, int argc, char **argv) {
                 rd_kafka_ConfigResource_t *config;
                 rd_kafka_AlterConfigOpType_t op_type;
                 rd_kafka_ResourceType_t restype =
-                    !strcmp(restype_s, "TOPIC")
-                        ? RD_KAFKA_RESOURCE_TOPIC
-                        : !strcmp(restype_s, "BROKER")
-                              ? RD_KAFKA_RESOURCE_BROKER
-                              : RD_KAFKA_RESOURCE_UNKNOWN;
+                    !strcmp(restype_s, "TOPIC")    ? RD_KAFKA_RESOURCE_TOPIC
+                    : !strcmp(restype_s, "BROKER") ? RD_KAFKA_RESOURCE_BROKER
+                                                   : RD_KAFKA_RESOURCE_UNKNOWN;
 
                 if (restype == RD_KAFKA_RESOURCE_UNKNOWN) {
                         usage("Invalid resource type: %s", restype_s);

examples/rdkafka_performance.c

@@ -1700,7 +1700,7 @@ int main(int argc, char **argv) {
                                 /* Batch fetch mode */
                                 ssize_t i = 0;
                                 r         = rd_kafka_consume_batch_queue(
-                                    rkqu, 1000, rkmessages, batch_size);
+                                            rkqu, 1000, rkmessages, batch_size);
                                 if (r != -1) {
                                         for (i = 0; i < r; i++) {
                                                 msg_consume(rkmessages[i],

examples/user_scram.c

@@ -138,11 +138,10 @@ int64_t parse_int(const char *what, const char *str) {
 }
 
 rd_kafka_ScramMechanism_t parse_mechanism(const char *arg) {
-        return !strcmp(arg, "SCRAM-SHA-256")
-                   ? RD_KAFKA_SCRAM_MECHANISM_SHA_256
-                   : !strcmp(arg, "SCRAM-SHA-512")
-                         ? RD_KAFKA_SCRAM_MECHANISM_SHA_512
-                         : RD_KAFKA_SCRAM_MECHANISM_UNKNOWN;
+        return !strcmp(arg, "SCRAM-SHA-256") ? RD_KAFKA_SCRAM_MECHANISM_SHA_256
+               : !strcmp(arg, "SCRAM-SHA-512")
+                   ? RD_KAFKA_SCRAM_MECHANISM_SHA_512
+                   : RD_KAFKA_SCRAM_MECHANISM_UNKNOWN;
 }
 
 static void print_descriptions(

examples/win_ssl_cert_store.cpp

@@ -161,8 +161,8 @@ class ExampleStoreRetriever {
   std::string GetErrorMsg(unsigned long error) {
     char *message = NULL;
     size_t ret    = FormatMessageA(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, nullptr,
-        error, 0, (char *)&message, 0, nullptr);
+           FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, nullptr,
+           error, 0, (char *)&message, 0, nullptr);
     if (ret == 0) {
       std::stringstream ss;
 

packaging/tools/style-format.sh

@@ -3,7 +3,7 @@
 # Check or apply/fix the project coding style to all files passed as arguments.
 # Uses clang-format for C/C++ and flake8 for Python.
 #
-# Requires clang-format version 10  (apt install clang-format-10).
+# Requires clang-format version 14  (apt install clang-format-14).
 #
 
 
@@ -27,8 +27,8 @@ else
 fi
 
 clang_format_version=$(${CLANG_FORMAT} --version | sed -Ee 's/.*version ([[:digit:]]+)\.[[:digit:]]+\.[[:digit:]]+.*/\1/')
-if [[ $clang_format_version != "10" ]] ; then
-    echo "$0: clang-format version 10, '$clang_format_version' detected"
+if [[ $clang_format_version != "14" ]] ; then
+    echo "$0: clang-format version 14, '$clang_format_version' detected"
     exit 1
 fi
 

src-cpp/rdkafkacpp_int.h

@@ -1403,8 +1403,8 @@ class KafkaConsumerImpl : virtual public KafkaConsumer,
                        OffsetCommitCb *offset_commit_cb) {
     rd_kafka_topic_partition_list_t *c_parts = partitions_to_c_parts(offsets);
     rd_kafka_resp_err_t err                  = rd_kafka_commit_queue(
-        rk_, c_parts, NULL, RdKafka::offset_commit_cb_trampoline0,
-        offset_commit_cb);
+                         rk_, c_parts, NULL, RdKafka::offset_commit_cb_trampoline0,
+                         offset_commit_cb);
     rd_kafka_topic_partition_list_destroy(c_parts);
     return static_cast<ErrorCode>(err);
   }

src/rdaddr.h

@@ -54,14 +54,13 @@ typedef union {
 #define sinx_family in.sin_family
 #define sinx_addr   in.sin_addr
 #define RD_SOCKADDR_INX_LEN(sinx)                                              \
-        ((sinx)->sinx_family == AF_INET                                        \
-             ? sizeof(struct sockaddr_in)                                      \
-             : (sinx)->sinx_family == AF_INET6 ? sizeof(struct sockaddr_in6)   \
-                                               : sizeof(rd_sockaddr_inx_t))
+        ((sinx)->sinx_family == AF_INET    ? sizeof(struct sockaddr_in)        \
+         : (sinx)->sinx_family == AF_INET6 ? sizeof(struct sockaddr_in6)       \
+                                           : sizeof(rd_sockaddr_inx_t))
 #define RD_SOCKADDR_INX_PORT(sinx)                                             \
-        ((sinx)->sinx_family == AF_INET                                        \
-             ? (sinx)->in.sin_port                                             \
-             : (sinx)->sinx_family == AF_INET6 ? (sinx)->in6.sin6_port : 0)
+        ((sinx)->sinx_family == AF_INET    ? (sinx)->in.sin_port               \
+         : (sinx)->sinx_family == AF_INET6 ? (sinx)->in6.sin6_port             \
+                                           : 0)
 
 #define RD_SOCKADDR_INX_PORT_SET(sinx, port)                                   \
         do {                                                                   \

src/rdavg.h

@@ -45,8 +45,9 @@ typedef struct rd_avg_s {
         } ra_v;
         mtx_t ra_lock;
         int ra_enabled;
-        enum { RD_AVG_GAUGE,
-               RD_AVG_COUNTER,
+        enum {
+                RD_AVG_GAUGE,
+                RD_AVG_COUNTER,
         } ra_type;
 #if WITH_HDRHISTOGRAM
         rd_hdr_histogram_t *ra_hdr;

src/rdfnv1a.c

@@ -70,18 +70,18 @@ int unittest_fnv1a(void) {
         const char *short_unaligned = "1234";
         const char *unaligned       = "PreAmbleWillBeRemoved,ThePrePartThatIs";
         const char *keysToTest[]    = {
-            "kafka",
-            "giberish123456789",
-            short_unaligned,
-            short_unaligned + 1,
-            short_unaligned + 2,
-            short_unaligned + 3,
-            unaligned,
-            unaligned + 1,
-            unaligned + 2,
-            unaligned + 3,
-            "",
-            NULL,
+               "kafka",
+               "giberish123456789",
+               short_unaligned,
+               short_unaligned + 1,
+               short_unaligned + 2,
+               short_unaligned + 3,
+               unaligned,
+               unaligned + 1,
+               unaligned + 2,
+               unaligned + 3,
+               "",
+               NULL,
         };
 
         // Acquired via https://play.golang.org/p/vWIhw3zJINA

src/rdkafka_admin.c

@@ -231,11 +231,12 @@ static const char *rd_kafka_admin_state_desc[] = {
  * @enum Admin request target broker. Must be negative values since the field
  *       used is broker_id.
  */
-enum { RD_KAFKA_ADMIN_TARGET_CONTROLLER  = -1, /**< Cluster controller */
-       RD_KAFKA_ADMIN_TARGET_COORDINATOR = -2, /**< (Group) Coordinator */
-       RD_KAFKA_ADMIN_TARGET_FANOUT      = -3, /**< This rko is a fanout and
-                                                *   and has no target broker */
-       RD_KAFKA_ADMIN_TARGET_ALL = -4,         /**< All available brokers */
+enum {
+        RD_KAFKA_ADMIN_TARGET_CONTROLLER  = -1, /**< Cluster controller */
+        RD_KAFKA_ADMIN_TARGET_COORDINATOR = -2, /**< (Group) Coordinator */
+        RD_KAFKA_ADMIN_TARGET_FANOUT      = -3, /**< This rko is a fanout and
+                                                 *   and has no target broker */
+        RD_KAFKA_ADMIN_TARGET_ALL = -4,         /**< All available brokers */
 };
 
 /**
@@ -2075,7 +2076,7 @@ rd_kafka_CreateTopicsResponse_parse(rd_kafka_op_t *rko_req,
                  * does not maintain ordering unfortunately. */
                 skel.topic = terr->topic;
                 orig_pos   = rd_list_index(&rko_result->rko_u.admin_result.args,
-                                         &skel, rd_kafka_NewTopic_cmp);
+                                           &skel, rd_kafka_NewTopic_cmp);
                 if (orig_pos == -1) {
                         rd_kafka_topic_result_destroy(terr);
                         rd_kafka_buf_parse_fail(
@@ -2284,7 +2285,7 @@ rd_kafka_DeleteTopicsResponse_parse(rd_kafka_op_t *rko_req,
                  * does not maintain ordering unfortunately. */
                 skel.topic = terr->topic;
                 orig_pos   = rd_list_index(&rko_result->rko_u.admin_result.args,
-                                         &skel, rd_kafka_DeleteTopic_cmp);
+                                           &skel, rd_kafka_DeleteTopic_cmp);
                 if (orig_pos == -1) {
                         rd_kafka_topic_result_destroy(terr);
                         rd_kafka_buf_parse_fail(
@@ -2569,7 +2570,7 @@ rd_kafka_CreatePartitionsResponse_parse(rd_kafka_op_t *rko_req,
                  * does not maintain ordering unfortunately. */
                 skel.topic = terr->topic;
                 orig_pos   = rd_list_index(&rko_result->rko_u.admin_result.args,
-                                         &skel, rd_kafka_NewPartitions_cmp);
+                                           &skel, rd_kafka_NewPartitions_cmp);
                 if (orig_pos == -1) {
                         rd_kafka_topic_result_destroy(terr);
                         rd_kafka_buf_parse_fail(
@@ -7382,11 +7383,11 @@ rd_kafka_ListConsumerGroupsResponse_parse(rd_kafka_op_t *rko_req,
         if (reply->rkbuf_err) {
                 error_code = reply->rkbuf_err;
                 error      = rd_kafka_error_new(
-                    error_code,
-                    "Broker [%d"
-                    "] "
-                    "ListConsumerGroups response protocol parse failure: %s",
-                    rd_kafka_broker_id(rkb), rd_kafka_err2str(error_code));
+                         error_code,
+                         "Broker [%d"
+                              "] "
+                              "ListConsumerGroups response protocol parse failure: %s",
+                         rd_kafka_broker_id(rkb), rd_kafka_err2str(error_code));
                 rd_list_add(&errors, error);
         }
 
@@ -7766,7 +7767,7 @@ rd_kafka_ConsumerGroupDescription_new(
 
         grpdesc->authorized_operations_cnt = authorized_operations_cnt;
         grpdesc->authorized_operations     = rd_kafka_AuthorizedOperations_copy(
-            authorized_operations, authorized_operations_cnt);
+                authorized_operations, authorized_operations_cnt);
 
         grpdesc->state = state;
         if (coordinator != NULL)

src/rdkafka_assignor.c

@@ -864,7 +864,7 @@ void ut_populate_internal_topic_metadata(rd_kafka_metadata_internal_t *mdi) {
 
                         partition_internal->racks_cnt = rd_list_cnt(curr_list);
                         partition_internal->racks     = rd_malloc(
-                            sizeof(char *) * partition_internal->racks_cnt);
+                                sizeof(char *) * partition_internal->racks_cnt);
                         RD_LIST_FOREACH(rack, curr_list, j) {
                                 partition_internal->racks[j] =
                                     rack; /* no duplication */
@@ -1666,10 +1666,10 @@ static int ut_assignors(void) {
                         /* Run assignor */
                         metadata_internal.metadata = metadata;
                         err                        = rd_kafka_assignor_run(
-                            rk->rk_cgrp, rkas,
-                            (rd_kafka_metadata_t *)(&metadata_internal),
-                            members, tests[i].member_cnt, errstr,
-                            sizeof(errstr));
+                                                   rk->rk_cgrp, rkas,
+                                                   (rd_kafka_metadata_t *)(&metadata_internal),
+                                                   members, tests[i].member_cnt, errstr,
+                                                   sizeof(errstr));
 
                         RD_UT_ASSERT(!err, "Assignor case %s for %s failed: %s",
                                      tests[i].name,

src/rdkafka_broker.c

@@ -2184,7 +2184,7 @@ rd_kafka_broker_reconnect_backoff(const rd_kafka_broker_t *rkb, rd_ts_t now) {
 static int rd_ut_reconnect_backoff(void) {
         rd_kafka_broker_t rkb = RD_ZERO_INIT;
         rd_kafka_conf_t conf  = {.reconnect_backoff_ms     = 10,
-                                .reconnect_backoff_max_ms = 90};
+                                 .reconnect_backoff_max_ms = 90};
         rd_ts_t now           = 1000000;
         int backoff;