TS-2888: remove fabricate_old_api_va

Author: persiaAziz-zz

proxy/http/HttpBodyFactory.cc

@@ -63,7 +63,7 @@ char *
 HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
                                         int64_t *resulting_buffer_length, char *content_language_out_buf,
                                         size_t content_language_buf_size, char *content_type_out_buf, size_t content_type_buf_size,
-                                        int format_size, const char *format, va_list ap)
+                                        int format_size, const char *format)
 {
   char *buffer            = nullptr;
   const char *lang_ptr    = nullptr;

proxy/http/HttpBodyFactory.h

@@ -157,14 +157,10 @@ class HttpBodyFactory
   ///////////////////////
   char *fabricate_with_old_api(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
                                int64_t *resulting_buffer_length, char *content_language_out_buf, size_t content_language_buf_size,
-                               char *content_type_out_buf, size_t content_type_buf_size, int format_size, const char *format,
-                               va_list ap);
+                               char *content_type_out_buf, size_t content_type_buf_size, int format_size, const char *format);
 
   char *
-  fabricate_with_old_api_build_va(const char *type, HttpTransact::State *context, int64_t max_buffer_length,
-                                  int64_t *resulting_buffer_length, char *content_language_out_buf,
-                                  size_t content_language_buf_size, char *content_type_out_buf, size_t content_type_buf_size,
-                                  const char *format, ...)
+  getFormat(int64_t max_buffer_length, int64_t *resulting_buffer_length, const char *format, ...)
   {
     char *msg = nullptr;
     va_list ap;
@@ -177,11 +173,7 @@ class HttpBodyFactory
         *resulting_buffer_length = ink_bvsprintf(msg, format, ap) - 1;
       }
     }
-    char *buf = fabricate_with_old_api(type, context, max_buffer_length, resulting_buffer_length, content_language_out_buf,
-                                       content_language_buf_size, content_type_out_buf, content_type_buf_size,
-                                       *resulting_buffer_length, msg, ap);
-    ats_free(msg);
-    return buf;
+    return msg;
   }
 
   void dump_template_tables(FILE *fp = stderr);

proxy/http/HttpTransact.cc

@@ -8200,7 +8200,7 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
 
   new_msg = body_factory->fabricate_with_old_api(error_body_type, s, 8192, &len, body_language, sizeof(body_language), body_type,
                                                  sizeof(body_type), s->internal_msg_buffer_size,
-                                                 s->internal_msg_buffer_size ? s->internal_msg_buffer : nullptr, nullptr);
+                                                 s->internal_msg_buffer_size ? s->internal_msg_buffer : nullptr);
 
   // After the body factory is called, a new "body" is allocated, and we must replace it. It is
   // unfortunate that there's no way to avoid this fabrication even when there is no substitutions...
@@ -8254,7 +8254,6 @@ HttpTransact::build_redirect_response(State *s)
   const char *new_url = nullptr;
   int new_url_len;
   char *to_free = nullptr;
-  char body_language[256], body_type[256];
 
   HTTPStatus status_code = HTTP_STATUS_MOVED_TEMPORARILY;
   char *reason_phrase    = (char *)(http_hdr_reason_lookup(status_code));
@@ -8292,10 +8291,9 @@ HttpTransact::build_redirect_response(State *s)
   //////////////////////////
   s->free_internal_msg_buffer();
   s->internal_msg_buffer_fast_allocator_size = -1;
-  s->internal_msg_buffer                     = body_factory->fabricate_with_old_api_build_va(
-    "redirect#moved_temporarily", s, 8192, &s->internal_msg_buffer_size, body_language, sizeof(body_language), body_type,
-    sizeof(body_type), "%s <a href=\"%s\">%s</a>.  %s.", "The document you requested is now", new_url, new_url,
-    "Please update your documents and bookmarks accordingly", NULL);
+  s->internal_msg_buffer = body_factory->getFormat(8192, &s->internal_msg_buffer_size, "%s <a href=\"%s\">%s</a>.  %s.",
+                                                   "The document you requested is now", new_url, new_url,
+                                                   "Please update your documents and bookmarks accordingly", NULL);
 
   h->set_content_length(s->internal_msg_buffer_size);
   h->value_set(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE, "text/html", 9);