Skip to content

TS-2888: remove vararg and format parameters from build_error_resoponse #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 1 commit into from
Mar 15, 2017
Merged

TS-2888: remove vararg and format parameters from build_error_resoponse #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions proxy/http/HttpBodyFactory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
const char *format, va_list ap)
int format_size, const char *format)
{
char *buffer = nullptr;
const char *lang_ptr = nullptr;
Expand Down Expand Up @@ -124,16 +124,8 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
///////////////////////////////////////////
// check if we don't need to format body //
///////////////////////////////////////////
if (format) {
// The length from ink_bvsprintf includes the trailing NUL, so adjust the final
// length accordingly.
int l = ink_bvsprintf(nullptr, format, ap);
if (l <= max_buffer_length) {
buffer = (char *)ats_malloc(l);
*resulting_buffer_length = ink_bvsprintf(buffer, format, ap) - 1;
plain_flag = true;
}
}

buffer = (format == nullptr) ? nullptr : ats_strndup(format, format_size);
/////////////////////////////////////////////////////////
// try to fabricate the desired type of error response //
/////////////////////////////////////////////////////////
Expand Down
24 changes: 13 additions & 11 deletions proxy/http/HttpBodyFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#include "HttpTransact.h"
#include "Main.h"
#include "ts/RawHashTable.h"
#include "ts/ink_sprintf.h"

#define HTTP_BODY_TEMPLATE_MAGIC 0xB0DFAC00
#define HTTP_BODY_SET_MAGIC 0xB0DFAC55
Expand Down Expand Up @@ -156,21 +157,22 @@ 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, 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;
char *msg = nullptr;
va_list ap;

va_start(ap, format);
msg = 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, format, ap);
va_end(ap);
if (format) {
// The length from ink_bvsprintf includes the trailing NUL, so adjust the final
// length accordingly.
int l = ink_bvsprintf(nullptr, format, ap);
if (l <= max_buffer_length) {
msg = (char *)ats_malloc(l);
*resulting_buffer_length = ink_bvsprintf(msg, format, ap) - 1;
}
}
return msg;
}

Expand Down
6 changes: 2 additions & 4 deletions proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3496,12 +3496,10 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)

switch (event) {
case VC_EVENT_INACTIVITY_TIMEOUT:
HttpTransact::build_error_response(&t_state, HTTP_STATUS_REQUEST_TIMEOUT, "POST Request timeout", "timeout#inactivity",
nullptr);
HttpTransact::build_error_response(&t_state, HTTP_STATUS_REQUEST_TIMEOUT, "POST Request timeout", "timeout#inactivity");
break;
case VC_EVENT_ACTIVE_TIMEOUT:
HttpTransact::build_error_response(&t_state, HTTP_STATUS_REQUEST_TIMEOUT, "POST Request timeout", "timeout#activity",
nullptr);
HttpTransact::build_error_response(&t_state, HTTP_STATUS_REQUEST_TIMEOUT, "POST Request timeout", "timeout#activity");
break;
}

Expand Down
Loading