[master] 17f8593 Remove dead assignments and whitespace
Federico G. Schwindt
fgsch at lodoss.net
Sat May 20 12:28:05 CEST 2017
commit 17f85938c0f283bee423a51058cb0a4334c85668
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Sat May 20 11:09:19 2017 +0100
Remove dead assignments and whitespace
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 670dc8f..e82fe5c 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -518,7 +518,6 @@ vbf_stp_fetchbody(struct worker *wrk, struct busyobj *bo)
AN(vfc->oc->flags & OC_F_PASS);
VSLb(wrk->vsl, SLT_FetchError,
"Pass delivery abandoned");
- vfps = VFP_END;
bo->htc->doclose = SC_RX_BODY;
break;
}
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index d734a79..c79d886 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -359,30 +359,18 @@ explain_flags(uint8_t flags, uint8_t type, struct vtclog *vl)
{
if (flags & ACK && (type == TYPE_PING || type == TYPE_SETTINGS)) {
vtc_log(vl, 3, "flag: ACK");
- flags &= ~ACK;
- } else if (flags & END_STREAM &&
- (type == TYPE_HEADERS ||
- type == TYPE_PUSH_PROMISE ||
- type == TYPE_DATA)) {
+ } else if (flags & END_STREAM && (type == TYPE_HEADERS ||
+ type == TYPE_PUSH_PROMISE || type == TYPE_DATA)) {
vtc_log(vl, 3, "flag: END_STREAM");
- flags &= ~END_STREAM;
- } else if (flags & END_HEADERS &&
- (type == TYPE_HEADERS ||
- type == TYPE_PUSH_PROMISE ||
- type == TYPE_CONTINUATION)) {
+ } else if (flags & END_HEADERS && (type == TYPE_HEADERS ||
+ type == TYPE_PUSH_PROMISE || type == TYPE_CONTINUATION)) {
vtc_log(vl, 3, "flag: END_TYPE_HEADERS");
- flags &= ~END_HEADERS;
- } else if (flags & PRIORITY &&
- (type == TYPE_HEADERS ||
- type == TYPE_PUSH_PROMISE)) {
+ } else if (flags & PRIORITY && (type == TYPE_HEADERS ||
+ type == TYPE_PUSH_PROMISE)) {
vtc_log(vl, 3, "flag: END_PRIORITY");
- flags &= ~PRIORITY;
- } else if (flags & PADDED &&
- (type == TYPE_DATA ||
- type == TYPE_HEADERS ||
- type == TYPE_PUSH_PROMISE)) {
+ } else if (flags & PADDED && (type == TYPE_DATA || type ==
+ TYPE_HEADERS || type == TYPE_PUSH_PROMISE)) {
vtc_log(vl, 3, "flag: PADDED");
- flags &= ~PADDED;
} else if (flags)
vtc_log(vl, 3, "UNKNOWN FLAG(S): 0x%02x", flags);
}
More information about the varnish-commit
mailing list