Skip to content

Commit 5fcf9fd

Browse files
generatedunixname89002005287564facebook-github-bot
generatedunixname89002005287564
authored andcommitted
ThriftScopifyEnum_graph_infra [B]
Reviewed By: dtolnay Differential Revision: D74196538 fbshipit-source-id: 207d073b945ff7034c616e02fc482ea91da33e80
1 parent c2f76b7 commit 5fcf9fd

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

proxygen/lib/http/HTTPHeaders.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ void HTTPHeaders::add(folly::StringPiece name, T&& value) {
429429
assert(name.size());
430430
const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
431431
auto namePtr =
432-
((code == HTTP_HEADER_OTHER)
432+
((code == HTTPHeaderCode::HTTP_HEADER_OTHER)
433433
? new std::string(name.data(), name.size())
434434
: (std::string*)HTTPCommonHeaders::getPointerToName(code));
435435
emplace_back(code, namePtr, std::forward<T>(value));
@@ -457,13 +457,13 @@ void HTTPHeaders::add(HTTPHeaderCode code, T&& value) {
457457
static_assert(true, "semicolon required")
458458

459459
// iterate over the positions of all headers with given name
460-
#define ITERATE_OVER_STRINGS(String, Block) \
461-
ITERATE_OVER_CODES(HTTP_HEADER_OTHER, { \
462-
if (caseInsensitiveEqual((String), *names()[pos])) { \
463-
{ \
464-
Block \
465-
} \
466-
} \
460+
#define ITERATE_OVER_STRINGS(String, Block) \
461+
ITERATE_OVER_CODES(HTTPHeaderCode::HTTP_HEADER_OTHER, { \
462+
if (caseInsensitiveEqual((String), *names()[pos])) { \
463+
{ \
464+
Block \
465+
} \
466+
} \
467467
})
468468

469469
// iterate over the positions of all headers with given name ignoring - and _
@@ -482,7 +482,7 @@ void HTTPHeaders::forEach(LAMBDA func) const {
482482
auto n = names();
483483
auto v = values();
484484
for (size_t i = 0; i < length_; ++i) {
485-
if (c[i] != HTTP_HEADER_NONE) {
485+
if (c[i] != HTTPHeaderCode::HTTP_HEADER_NONE) {
486486
func(*n[i], v[i]);
487487
}
488488
}
@@ -494,7 +494,7 @@ void HTTPHeaders::forEachWithCode(LAMBDA func) const {
494494
auto n = names();
495495
auto v = values();
496496
for (size_t i = 0; i < length_; ++i) {
497-
if (c[i] != HTTP_HEADER_NONE) {
497+
if (c[i] != HTTPHeaderCode::HTTP_HEADER_NONE) {
498498
func(c[i], *n[i], v[i]);
499499
}
500500
}
@@ -504,7 +504,7 @@ template <typename LAMBDA> // const string & -> bool
504504
bool HTTPHeaders::forEachValueOfHeader(folly::StringPiece name,
505505
LAMBDA func) const {
506506
const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
507-
if (code != HTTP_HEADER_OTHER) {
507+
if (code != HTTPHeaderCode::HTTP_HEADER_OTHER) {
508508
return forEachValueOfHeader(code, func);
509509
} else {
510510
ITERATE_OVER_STRINGS(name, {
@@ -549,16 +549,16 @@ bool HTTPHeaders::removeByPredicate(LAMBDA func) {
549549
auto n = names();
550550
auto v = values();
551551
for (size_t i = 0; i < length_; ++i) {
552-
if (c[i] == HTTP_HEADER_NONE || !func(c[i], *n[i], v[i])) {
552+
if (c[i] == HTTPHeaderCode::HTTP_HEADER_NONE || !func(c[i], *n[i], v[i])) {
553553
continue;
554554
}
555555

556-
if (c[i] == HTTP_HEADER_OTHER) {
556+
if (c[i] == HTTPHeaderCode::HTTP_HEADER_OTHER) {
557557
delete n[i];
558558
n[i] = nullptr;
559559
}
560560

561-
c[i] = HTTP_HEADER_NONE;
561+
c[i] = HTTPHeaderCode::HTTP_HEADER_NONE;
562562
++deletedCount_;
563563
removed = true;
564564
}

proxygen/lib/http/codec/compress/HPACKHeaderName.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class HPACKHeaderName {
3636
storeAddress(name);
3737
}
3838
explicit HPACKHeaderName(HTTPHeaderCode headerCode) {
39-
CHECK_NE(headerCode, HTTP_HEADER_NONE);
40-
CHECK_NE(headerCode, HTTP_HEADER_OTHER);
39+
CHECK_NE(headerCode, HTTPHeaderCode::HTTP_HEADER_NONE);
40+
CHECK_NE(headerCode, HTTPHeaderCode::HTTP_HEADER_OTHER);
4141
address_ = HTTPCommonHeaders::getPointerToName(
4242
headerCode, HTTPCommonHeaderTableType::TABLE_LOWERCASE);
4343
}
@@ -222,7 +222,7 @@ template <>
222222
struct hash<proxygen::HPACKHeaderName> {
223223
size_t operator()(const proxygen::HPACKHeaderName& headerName) const {
224224
auto code = headerName.getHeaderCode();
225-
if (code == proxygen::HTTP_HEADER_OTHER) {
225+
if (code == proxygen::HTTPHeaderCode::HTTP_HEADER_OTHER) {
226226
return std::hash<std::string>()(headerName.get());
227227
}
228228
return std::hash<uint8_t>()(code);

0 commit comments

Comments
 (0)