From d5360b6c128482648fc10b436c3f4f50bba5b02e Mon Sep 17 00:00:00 2001 From: Leif Hedstrom Date: Wed, 7 Oct 2020 16:36:16 -0600 Subject: [PATCH] Remove some usless defines, which just obsfucates code --- proxy/hdrs/HdrToken.cc | 2 +- proxy/hdrs/HdrToken.h | 6 ------ proxy/hdrs/MIME.h | 2 +- proxy/http/HttpTransactHeaders.cc | 6 +++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc index fcfc5c656b6..5ea3b4f0e44 100644 --- a/proxy/hdrs/HdrToken.cc +++ b/proxy/hdrs/HdrToken.cc @@ -466,7 +466,7 @@ hdrtoken_init() prefix.wks_info.name = nullptr; // default, can override later prefix.wks_info.slotid = MIME_SLOTID_NONE; // default, can override later prefix.wks_info.mask = TOK_64_CONST(0); // default, can override later - prefix.wks_info.flags = MIME_FLAGS_MULTVALS; // default, can override later + prefix.wks_info.flags = HTIF_MULTVALS; // default, can override later int sstr_len = snap_up_to_multiple(hdrtoken_str_lengths[i] + 1, sizeof(HdrTokenHeapPrefix)); diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h index 036805234b1..dc3f34fe232 100644 --- a/proxy/hdrs/HdrToken.h +++ b/proxy/hdrs/HdrToken.h @@ -85,12 +85,6 @@ enum HdrTokenInfoFlags { HTIF_PROXYAUTH = 1 << 3 }; -#define MIME_FLAGS_NONE HTIF_NONE -#define MIME_FLAGS_COMMAS HTIF_COMMAS -#define MIME_FLAGS_MULTVALS HTIF_MULTVALS -#define MIME_FLAGS_HOPBYHOP HTIF_HOPBYHOP -#define MIME_FLAGS_PROXYAUTH HTIF_PROXYAUTH - extern DFA *hdrtoken_strs_dfa; extern int hdrtoken_num_wks; diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h index b15d665092d..bce38ae87cc 100644 --- a/proxy/hdrs/MIME.h +++ b/proxy/hdrs/MIME.h @@ -136,7 +136,7 @@ struct MIMEField { supports_commas() const { if (m_wks_idx >= 0) { - return (hdrtoken_index_to_flags(m_wks_idx) & MIME_FLAGS_COMMAS); + return (hdrtoken_index_to_flags(m_wks_idx) & HTIF_COMMAS); } return true; // by default, assume supports commas } diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc index 52fc1360235..1a54fe2ab5b 100644 --- a/proxy/http/HttpTransactHeaders.cc +++ b/proxy/http/HttpTransactHeaders.cc @@ -62,7 +62,7 @@ HttpTransactHeaders::is_this_a_hop_by_hop_header(const char *field_name) if (!hdrtoken_is_wks(field_name)) { return (false); } - if ((hdrtoken_wks_to_flags(field_name) & MIME_FLAGS_HOPBYHOP) && (field_name != MIME_FIELD_KEEP_ALIVE)) { + if ((hdrtoken_wks_to_flags(field_name) & HTIF_HOPBYHOP) && (field_name != MIME_FIELD_KEEP_ALIVE)) { return (true); } else { return (false); @@ -228,9 +228,9 @@ HttpTransactHeaders::copy_header_fields(HTTPHdr *src_hdr, HTTPHdr *new_hdr, bool int field_flags = hdrtoken_index_to_flags(field->m_wks_idx); - if (field_flags & MIME_FLAGS_HOPBYHOP) { + if (field_flags & HTIF_HOPBYHOP) { // Delete header if not in special proxy_auth retention mode - if ((!retain_proxy_auth_hdrs) || (!(field_flags & MIME_FLAGS_PROXYAUTH))) { + if ((!retain_proxy_auth_hdrs) || (!(field_flags & HTIF_PROXYAUTH))) { new_hdr->field_delete(field); } } else if (field->m_wks_idx == MIME_WKSIDX_DATE) {