rewrite log_regex_error

Author: Shamzik

runtime-light/stdlib/string/regex-functions.cpp

@@ -267,11 +267,11 @@ class preg_replacement_parser {
   }
 };
 
-template<typename... Args>
-void log_regex_error(int32_t regex_error, std::format_string<Args..., kphp::log::impl::wrapped_arg_t<char*>> fmt, Args&&... args) noexcept {
+template<size_t N>
+void log_regex_error(const char (&msg)[N], int32_t regex_error) noexcept {
   std::array<char, ERROR_BUFFER_LENGTH> buffer{};
   pcre2_get_error_message_8(regex_error, reinterpret_cast<PCRE2_UCHAR8*>(buffer.data()), buffer.size());
-  kphp::log::warning(fmt, std::forward<Args>(args)..., buffer.data());
+  kphp::log::warning("{}: {}", msg, buffer.data());
 }
 
 bool compile_regex(RegexInfo& regex_info) noexcept {
@@ -429,7 +429,7 @@ bool compile_regex(RegexInfo& regex_info) noexcept {
                                                 std::addressof(error_number), std::addressof(error_offset), regex_state.compile_context.get()),
                                 pcre2_code_free_8};
   if (!regex_code) [[unlikely]] {
-    log_regex_error(error_number, "can't compile pcre2 regex due to error at offset {}: {}", error_offset);
+    log_regex_error("can't compile pcre2 regex due to error: {}", error_number);
     return false;
   }
 
@@ -659,7 +659,7 @@ bool replace_regex(RegexInfo& regex_info, uint64_t limit) noexcept {
                                                   reinterpret_cast<PCRE2_UCHAR8*>(runtime_ctx.static_SB.buffer()), std::addressof(output_length));
 
     if (regex_info.replace_count < 0) [[unlikely]] {
-      log_regex_error(regex_info.replace_count, "pcre2_substitute error {}");
+      log_regex_error("pcre2_substitute error {}", regex_info.replace_count);
       return false;
     }
   } else { // replace only 'limit' times
@@ -672,7 +672,7 @@ bool replace_regex(RegexInfo& regex_info, uint64_t limit) noexcept {
     for (; regex_info.replace_count < limit; ++regex_info.replace_count) {
       auto expected_opt_match_view{pcre2_matcher.next()};
       if (!expected_opt_match_view.has_value()) [[unlikely]] {
-        log_regex_error(expected_opt_match_view.error(), "can't replace by pcre2 regex due to match error: {}");
+        log_regex_error("can't replace by pcre2 regex due to match error: {}", expected_opt_match_view.error());
         return false;
       }
       auto opt_match_view{*expected_opt_match_view};
@@ -727,7 +727,7 @@ std::optional<array<mixed>> split_regex(RegexInfo& regex_info, int64_t limit, bo
   for (size_t out_parts_count{1}; limit == kphp::regex::PREG_NOLIMIT || out_parts_count < limit;) {
     auto expected_opt_match_view{pcre2_matcher.next()};
     if (!expected_opt_match_view.has_value()) [[unlikely]] {
-      log_regex_error(expected_opt_match_view.error(), "can't split by pcre2 regex due to match error: {}");
+      log_regex_error("can't split by pcre2 regex due to match error: {}", expected_opt_match_view.error());
       return std::nullopt;
     }
     auto opt_match_view{*expected_opt_match_view};
@@ -833,7 +833,7 @@ Optional<int64_t> f$preg_match(const string& pattern, const string& subject, Opt
   // The return from pcre2_match() is one more than the highest numbered capturing pair that has been set
   // (for example, 1 if there are no captures), zero if the vector of offsets is too small, or a negative error code for no match and other errors.
   if (ret_code < 0 && ret_code != PCRE2_ERROR_NOMATCH) [[unlikely]] {
-    log_regex_error(ret_code, "can't match by pcre2 regex due to error: {}");
+    log_regex_error("can't match by pcre2 regex due to error: {}", ret_code);
     return false;
   }
   regex_info.match_count = ret_code != PCRE2_ERROR_NOMATCH ? ret_code : 0;
@@ -901,7 +901,7 @@ Optional<int64_t> f$preg_match_all(const string& pattern, const string& subject,
     expected_opt_match_view = pcre2_matcher.next();
   }
   if (!expected_opt_match_view.has_value()) [[unlikely]] {
-    log_regex_error(expected_opt_match_view.error(), "can't find all matches due to match error: {}");
+    log_regex_error("can't find all matches due to match error: {}", expected_opt_match_view.error());
     return false;
   }