style(appsec): clang-format-19 helper sources

morrisonlevi · claude · morrisonlevi · commit dc150daf72a2 · 2026-04-08T12:52:59.000-06:00
Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/appsec/src/extension/commands/request_shutdown.c b/appsec/src/extension/commands/request_shutdown.c
@@ -130,7 +130,7 @@ static void _pack_headers_no_cookies_llist(
 
     zend_llist_position pos;
     for (sapi_header_struct *header = zend_llist_get_first_ex(hl, &pos); header;
-         header = zend_llist_get_next_ex(hl, &pos)) {
+        header = zend_llist_get_next_ex(hl, &pos)) {
         const char *pcol = memchr(header->header, ':', header->header_len);
         if (!pcol) {
             continue;
@@ -172,7 +172,7 @@ static void _pack_headers_no_cookies_llist(
         mpack_start_array(w, zend_llist_count(coll));
         zend_llist_position p;
         for (struct _header_val *hv = zend_llist_get_first_ex(coll, &p); hv;
-             hv = zend_llist_get_next_ex(coll, &p)) {
+            hv = zend_llist_get_next_ex(coll, &p)) {
             dd_mpack_write_nullable_str_lim(
                 w, hv->val, hv->len, DD_MPACK_DEF_STRING_LIMIT);
         }
@@ -189,7 +189,7 @@ static const char *nullable _header_content_type_llist(
 {
     zend_llist_position pos;
     for (sapi_header_struct *header = zend_llist_get_first_ex(hl, &pos); header;
-         header = zend_llist_get_next_ex(hl, &pos)) {
+        header = zend_llist_get_next_ex(hl, &pos)) {
         if (header->header_len >= LSTRLEN("content-type") &&
             strncasecmp(header->header, LSTRARG("content-type")) == 0) {
             const char *pcol = memchr(header->header, ':', header->header_len);
diff --git a/appsec/src/extension/commands_helpers.c b/appsec/src/extension/commands_helpers.c
@@ -805,7 +805,7 @@ static void _dump_out_msg(dd_log_level_t lvl, zend_llist *iovecs)
     zend_llist_position pos;
     int i = 1;
     for (struct iovec *iov = zend_llist_get_first_ex(iovecs, &pos); iov;
-         iov = zend_llist_get_next_ex(iovecs, &pos), i++) {
+        iov = zend_llist_get_next_ex(iovecs, &pos), i++) {
         zend_string *zstr = php_base64_encode(iov->iov_base, iov->iov_len);
         if (ZSTR_LEN(zstr) > INT_MAX) {
             return;
diff --git a/appsec/src/extension/ddappsec.c b/appsec/src/extension/ddappsec.c
@@ -130,7 +130,7 @@ static void ddappsec_sort_modules(void *base, size_t count, size_t siz,
 
     // Reorder ddappsec to ensure it's always after ddtrace
     for (Bucket *module = base, *end = module + count, *ddappsec_module = NULL;
-         module < end; ++module) {
+        module < end; ++module) {
         zend_module_entry *m = (zend_module_entry *)Z_PTR(module->val);
         if (m->name == ddappsec_module_entry.name) {
             ddappsec_module = module;
diff --git a/appsec/src/extension/entity_body.c b/appsec/src/extension/entity_body.c
@@ -192,7 +192,7 @@ static bool _assume_utf8(const char *ct, size_t ct_len)
         return true;
     }
     for (const char *end = ct + ct_len, *c = psemi + 1;
-         c < end - LSTRLEN("charset=utf-8") + 1; c++) {
+        c < end - LSTRLEN("charset=utf-8") + 1; c++) {
         if (tolower(*c) == 'c' && tolower(*(c + 1)) == 'h' &&
             tolower(*(c + 2)) == 'a' && tolower(*(c + 3)) == 'r' &&
             tolower(*(c + 4)) == 's' && tolower(*(c + 5)) == 'e' && // NOLINT
diff --git a/appsec/src/extension/network.c b/appsec/src/extension/network.c
@@ -187,7 +187,7 @@ static size_t _iovecs_total_size(zend_llist *nonnull iovecs)
     zend_llist_position pos;
     size_t total = 0;
     for (struct iovec *iov = zend_llist_get_first_ex(iovecs, &pos); iov;
-         iov = zend_llist_get_next_ex(iovecs, &pos)) {
+        iov = zend_llist_get_next_ex(iovecs, &pos)) {
         total += iov->iov_len;
     }
     return total;
@@ -212,7 +212,7 @@ dd_result dd_conn_sendv(dd_conn *nonnull conn, zend_llist *nonnull iovecs)
     zend_llist_position pos;
     size_t i = 1;
     for (struct iovec *iov = zend_llist_get_first_ex(iovecs, &pos); iov;
-         iov = zend_llist_get_next_ex(iovecs, &pos), i++) {
+        iov = zend_llist_get_next_ex(iovecs, &pos), i++) {
         iovs[i] = *iov;
     }
 
diff --git a/appsec/src/extension/request_abort.c b/appsec/src/extension/request_abort.c
@@ -667,9 +667,9 @@ static void _run_rshutdowns(void)
 
     mlog_g(dd_log_debug, "Running remaining extensions' RSHUTDOWN");
     for (zend_hash_internal_pointer_end_ex(&module_registry, &pos);
-         (module = zend_hash_get_current_data_ptr_ex(&module_registry, &pos)) !=
-         NULL;
-         zend_hash_move_backwards_ex(&module_registry, &pos)) {
+        (module = zend_hash_get_current_data_ptr_ex(&module_registry, &pos)) !=
+        NULL;
+        zend_hash_move_backwards_ex(&module_registry, &pos)) {
         if (!found_ddappsec && strcmp("ddappsec", module->name) == 0) {
             found_ddappsec = true;
             continue;
diff --git a/appsec/src/extension/tags.c b/appsec/src/extension/tags.c
@@ -464,7 +464,7 @@ static zend_string *_concat_json_fragments(void)
 
     zend_llist_position pos;
     for (zend_string **sp = zend_llist_get_first_ex(&_appsec_json_frags, &pos);
-         sp != NULL; sp = zend_llist_get_next_ex(&_appsec_json_frags, &pos)) {
+        sp != NULL; sp = zend_llist_get_next_ex(&_appsec_json_frags, &pos)) {
         zend_string *s = *sp;
         needed_len += ZSTR_LEN(s);
     }
@@ -476,8 +476,8 @@ static zend_string *_concat_json_fragments(void)
 
     size_t i = 0;
     for (zend_string **sp = zend_llist_get_first_ex(&_appsec_json_frags, &pos);
-         sp != NULL;
-         sp = zend_llist_get_next_ex(&_appsec_json_frags, &pos), i++) {
+        sp != NULL;
+        sp = zend_llist_get_next_ex(&_appsec_json_frags, &pos), i++) {
         if (i != 0) {
             *buf++ = ',';
         }
@@ -791,7 +791,7 @@ static void _dd_response_headers(zend_array *meta_ht)
     zend_llist *l = &SG(sapi_headers).headers;
     zend_llist_position pos;
     for (sapi_header_struct *header = zend_llist_get_first_ex(l, &pos); header;
-         header = zend_llist_get_next_ex(l, &pos)) {
+        header = zend_llist_get_next_ex(l, &pos)) {
         const char *pcol = memchr(header->header, ':', header->header_len);
         if (!pcol) {
             if (header->header_len <= INT_MAX) {
diff --git a/appsec/src/helper/main.cpp b/appsec/src/helper/main.cpp
@@ -104,7 +104,7 @@ bool ensure_unique_abstract_socket(std::string_view socket_path)
         return false;
     }
 
-    struct sockaddr_un addr {};
+    struct sockaddr_un addr{};
     addr.sun_family = AF_UNIX;
     addr.sun_path[0] = '\0';
 
diff --git a/appsec/src/helper/network/acceptor.cpp b/appsec/src/helper/network/acceptor.cpp
@@ -28,7 +28,7 @@ acceptor::acceptor(const std::string_view &sv)
         throw std::system_error(errno, std::generic_category());
     }
 
-    struct sockaddr_un addr {};
+    struct sockaddr_un addr{};
     std::size_t addr_size;
     addr.sun_family = AF_UNIX;
     bool const is_abstract = (!sv.empty() && sv[0] == '@');
@@ -111,7 +111,7 @@ void acceptor::set_accept_timeout(std::chrono::seconds timeout)
 
 std::unique_ptr<base_socket> acceptor::accept()
 {
-    struct sockaddr_un addr {};
+    struct sockaddr_un addr{};
     socklen_t len = sizeof(addr);
 
     int s =
diff --git a/appsec/src/helper/rate_limit.hpp b/appsec/src/helper/rate_limit.hpp
@@ -19,7 +19,7 @@ namespace dds {
 template <typename T> class rate_limiter {
 public:
     explicit rate_limiter(uint32_t max_per_second)
-        : max_per_second_(max_per_second){};
+        : max_per_second_(max_per_second) {};
     bool allow()
     {
         SPDLOG_TRACE("rate_limiter: allow() called");
diff --git a/appsec/src/helper/remote_config/config.cpp b/appsec/src/helper/remote_config/config.cpp
@@ -57,7 +57,7 @@ mapped_memory config::read() const
     auto close_fs = defer{[fd]() { ::close(fd); }};
 
     // check that the uid of the shared memory segment is the same as ours
-    struct ::stat shm_stat {};
+    struct ::stat shm_stat{};
     if (::fstat(fd, &shm_stat) == -1) {
         throw std::runtime_error{
             "Call to fstat on memory segment failed: " + strerror_ts(errno)};
diff --git a/appsec/src/helper/remote_config/config.hpp b/appsec/src/helper/remote_config/config.hpp
@@ -135,9 +135,7 @@ class parsed_config_key {
     std::string key_;
     std::string_view source_;
     std::uint64_t org_id_{};
-    class product product_ {
-        known_products::UNKNOWN
-    };
+    class product product_{known_products::UNKNOWN};
     std::string_view config_id_;
     std::string_view name_;
 };
diff --git a/appsec/src/helper/remote_config/listeners/asm_features_listener.hpp b/appsec/src/helper/remote_config/listeners/asm_features_listener.hpp
@@ -17,7 +17,7 @@ class asm_features_listener : public listener_base {
 public:
     explicit asm_features_listener(
         std::shared_ptr<dds::service_config> service_config)
-        : service_config_(std::move(service_config)){};
+        : service_config_(std::move(service_config)) {};
 
     void init() override;
     void on_update(const config &config) override;
diff --git a/appsec/src/helper/runner.cpp b/appsec/src/helper/runner.cpp
@@ -38,7 +38,7 @@ std::unique_ptr<network::base_acceptor> acceptor_from_config(
     if (sock_path.size() >= 4 && sock_path.substr(0, 3) == "fd:") {
         auto rest{sock_path.substr(3)};
         int const fd = std::stoi(std::string{rest}); // can throw
-        struct stat statbuf {};
+        struct stat statbuf{};
         int const res = fstat(fd, &statbuf);
         if (res == -1 || !S_ISSOCK(statbuf.st_mode)) {
             throw std::invalid_argument{
diff --git a/appsec/src/helper/utils.cpp b/appsec/src/helper/utils.cpp
@@ -20,7 +20,7 @@ std::string read_file(std::string_view filename)
         throw std::system_error(errno, std::generic_category());
     }
 
-    struct stat statbuf {};
+    struct stat statbuf{};
     auto rc = stat(std::string{filename}.c_str(), &statbuf);
     auto file_size = rc == 0 ? statbuf.st_size : 0;
     std::string buffer(file_size, '\0');
diff --git a/appsec/tests/helper/engine_test.cpp b/appsec/tests/helper/engine_test.cpp
@@ -279,14 +279,15 @@ TEST(EngineTest, WafDefaultActions)
 
     auto listener = std::make_unique<mock::listener>();
     EXPECT_CALL(*listener, call(_, _, _))
-        .WillRepeatedly(Invoke([](dds::parameter_view &data, dds::event &event_,
-                                   const dds::network::request_exec_options
-                                       &options) -> void {
-            event_.actions.push_back({dds::action_type::redirect, {}});
-            event_.actions.push_back({dds::action_type::block, {}});
-            event_.actions.push_back({dds::action_type::stack_trace, {}});
-            event_.actions.push_back({dds::action_type::extract_schema, {}});
-        }));
+        .WillRepeatedly(Invoke(
+            [](dds::parameter_view &data, dds::event &event_,
+                const dds::network::request_exec_options &options) -> void {
+                event_.actions.push_back({dds::action_type::redirect, {}});
+                event_.actions.push_back({dds::action_type::block, {}});
+                event_.actions.push_back({dds::action_type::stack_trace, {}});
+                event_.actions.push_back(
+                    {dds::action_type::extract_schema, {}});
+            }));
 
     auto sub = std::make_unique<mock::subscriber>();
     EXPECT_CALL(*sub, get_listener()).WillOnce(Invoke([&]() {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ static bool _assume_utf8(const char *ct, size_t ct_len)`
`192`	`192`	`return true;`
`193`	`193`	`}`
`194`	`194`	`for (const char end = ct + ct_len, c = psemi + 1;`
`195`		`- c < end - LSTRLEN("charset=utf-8") + 1; c++) {`
	`195`	`+ c < end - LSTRLEN("charset=utf-8") + 1; c++) {`
`196`	`196`	`if (tolower(c) == 'c' && tolower((c + 1)) == 'h' &&`
`197`	`197`	`tolower((c + 2)) == 'a' && tolower((c + 3)) == 'r' &&`
`198`	`198`	`tolower((c + 4)) == 's' && tolower((c + 5)) == 'e' && // NOLINT`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ bool ensure_unique_abstract_socket(std::string_view socket_path)`
`104`	`104`	`return false;`
`105`	`105`	`}`
`106`	`106`
`107`		`- struct sockaddr_un addr {};`
	`107`	`+ struct sockaddr_un addr{};`
`108`	`108`	`addr.sun_family = AF_UNIX;`
`109`	`109`	`addr.sun_path[0] = '\0';`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ acceptor::acceptor(const std::string_view &sv)`
`28`	`28`	`throw std::system_error(errno, std::generic_category());`
`29`	`29`	`}`
`30`	`30`
`31`		`- struct sockaddr_un addr {};`
	`31`	`+ struct sockaddr_un addr{};`
`32`	`32`	`std::size_t addr_size;`
`33`	`33`	`addr.sun_family = AF_UNIX;`
`34`	`34`	`bool const is_abstract = (!sv.empty() && sv[0] == '@');`
`@@ -111,7 +111,7 @@ void acceptor::set_accept_timeout(std::chrono::seconds timeout)`
`111`	`111`
`112`	`112`	`std::unique_ptr<base_socket> acceptor::accept()`
`113`	`113`	`{`
`114`		`- struct sockaddr_un addr {};`
	`114`	`+ struct sockaddr_un addr{};`
`115`	`115`	`socklen_t len = sizeof(addr);`
`116`	`116`
`117`	`117`	`int s =`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace dds {`
`19`	`19`	`template <typename T> class rate_limiter {`
`20`	`20`	`public:`
`21`	`21`	`explicit rate_limiter(uint32_t max_per_second)`
`22`		`- : max_per_second_(max_per_second){};`
	`22`	`+ : max_per_second_(max_per_second) {};`
`23`	`23`	`bool allow()`
`24`	`24`	`{`
`25`	`25`	`SPDLOG_TRACE("rate_limiter: allow() called");`