[master] 321b3b4 Make sure all "table" .h files, and only those, have FlexeLint shutuppery about indentation.
Poul-Henning Kamp
phk at FreeBSD.org
Mon Jun 1 09:29:34 CEST 2015
commit 321b3b460d4ac7ca65c3686c6e55eece525a2c07
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jun 1 07:13:08 2015 +0000
Make sure all "table" .h files, and only those, have FlexeLint
shutuppery about indentation.
diff --git a/include/tbl/acct_fields_req.h b/include/tbl/acct_fields_req.h
index a1759f5..fece3dc 100644
--- a/include/tbl/acct_fields_req.h
+++ b/include/tbl/acct_fields_req.h
@@ -30,7 +30,9 @@
* NB: Remember to mark those in vsc_fields.h to be included in struct dstat.
*/
+/*lint -save -e525 -e539 */
ACCT(req_hdrbytes)
ACCT(req_bodybytes)
ACCT(resp_hdrbytes)
ACCT(resp_bodybytes)
+/*lint -restore */
diff --git a/include/tbl/backend_poll.h b/include/tbl/backend_poll.h
index a9ee3a3..04174cb 100644
--- a/include/tbl/backend_poll.h
+++ b/include/tbl/backend_poll.h
@@ -27,6 +27,7 @@
*
*/
+/*lint -save -e525 -e539 */
BITMAP(good_ipv4, '4', "Good IPv4", 0)
BITMAP(good_ipv6, '6', "Good IPv6", 0)
BITMAP( err_xmit, 'x', "Error Xmit", 0)
@@ -34,3 +35,4 @@ BITMAP(good_xmit, 'X', "Good Xmit", 0)
BITMAP( err_recv, 'r', "Error Recv", 0)
BITMAP(good_recv, 'R', "Good Recv", 0)
BITMAP(happy, 'H', "Happy", 1)
+/* lint -restore */
diff --git a/include/tbl/ban_vars.h b/include/tbl/ban_vars.h
index a3df78b..7bc665d 100644
--- a/include/tbl/ban_vars.h
+++ b/include/tbl/ban_vars.h
@@ -29,7 +29,9 @@
*
*/
+/*lint -save -e525 -e539 */
PVAR("req.url", BANS_FLAG_REQ, BANS_ARG_URL)
PVAR("req.http.", BANS_FLAG_REQ | BANS_FLAG_HTTP, BANS_ARG_REQHTTP)
PVAR("obj.status", BANS_FLAG_OBJ, BANS_ARG_OBJSTATUS)
PVAR("obj.http.", BANS_FLAG_OBJ | BANS_FLAG_HTTP, BANS_ARG_OBJHTTP)
+/*lint -restore */
diff --git a/include/tbl/debug_bits.h b/include/tbl/debug_bits.h
index ba9400a..31eef0c 100644
--- a/include/tbl/debug_bits.h
+++ b/include/tbl/debug_bits.h
@@ -29,6 +29,7 @@
*
*/
+/*lint -save -e525 -e539 */
DEBUG_BIT(REQ_STATE, req_state, "VSL Request state engine")
DEBUG_BIT(WORKSPACE, workspace, "VSL Workspace operations")
DEBUG_BIT(WAITER, waiter, "VSL Waiter internals")
@@ -40,3 +41,4 @@ DEBUG_BIT(LURKER, lurker, "VSL Ban lurker")
DEBUG_BIT(ESI_CHOP, esi_chop, "Chop ESI fetch to bits")
DEBUG_BIT(FLUSH_HEAD, flush_head, "Flush after http1 head")
DEBUG_BIT(VTC_MODE, vtc_mode, "Varnishtest Mode")
+/*lint -restore */
diff --git a/include/tbl/feature_bits.h b/include/tbl/feature_bits.h
index 388f9da..6fcf279 100644
--- a/include/tbl/feature_bits.h
+++ b/include/tbl/feature_bits.h
@@ -29,6 +29,7 @@
*
*/
+/*lint -save -e525 -e539 */
FEATURE_BIT(SHORT_PANIC, short_panic,
"Short panic message.",
"Reduce level of detail for panic messages."
@@ -58,3 +59,4 @@ FEATURE_BIT(ESI_REMOVE_BOM, esi_remove_bom,
"Remove UTF-8 BOM from front of object."
"Ignore and remove the UTF-8 BOM (0xeb 0xbb 0xbf) from front of object."
)
+/*lint -restore */
diff --git a/include/tbl/http_response.h b/include/tbl/http_response.h
index f60820c..6baacfb 100644
--- a/include/tbl/http_response.h
+++ b/include/tbl/http_response.h
@@ -28,6 +28,7 @@
*
*/
+/*lint -save -e525 -e539 */
HTTP_RESP(101, "Switching Protocols")
HTTP_RESP(200, "OK")
HTTP_RESP(201, "Created")
@@ -68,3 +69,4 @@ HTTP_RESP(502, "Bad Gateway")
HTTP_RESP(503, "Service Unavailable")
HTTP_RESP(504, "Gateway Timeout")
HTTP_RESP(505, "HTTP Version Not Supported")
+/*lint -restore */
diff --git a/include/tbl/vsc_all.h b/include/tbl/vsc_all.h
index 6cc1805..0ef0b08 100644
--- a/include/tbl/vsc_all.h
+++ b/include/tbl/vsc_all.h
@@ -28,6 +28,7 @@
*/
+/*lint -save -e525 -e539 */
VSC_DO(MAIN, main, VSC_type_main)
#include "tbl/vsc_f_main.h"
VSC_DONE(MAIN, main, VSC_type_main)
@@ -67,3 +68,4 @@ VSC_DO(LCK, lck, VSC_type_lck)
#include "tbl/vsc_fields.h"
#undef VSC_DO_LCK
VSC_DONE(LCK, lck, VSC_type_lck)
+/*lint -restore */
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index ecb2683..fff29d5 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -42,6 +42,7 @@
* Long Description (in RST "definition list" format)
*/
+/*lint -save -e525 -e539 */
#define NODEF_NOTICE \
"NB: This log record is masked by default.\n\n"
@@ -518,3 +519,4 @@ SLTM(VfpAcct, 0, "Fetch filter accounting",
)
#undef NODEF_NOTICE
+/*lint -restore */
diff --git a/include/tbl/vsl_tags_http.h b/include/tbl/vsl_tags_http.h
index ab09d70..82a2219 100644
--- a/include/tbl/vsl_tags_http.h
+++ b/include/tbl/vsl_tags_http.h
@@ -43,6 +43,7 @@
*
*/
+/*lint -save -e525 -e539 */
SLTH(Method, HTTP_HDR_METHOD, 1, 0, "method",
"The HTTP request method used.\n\n"
)
@@ -79,3 +80,4 @@ SLTH(Unset, HTTP_HDR_UNSET, 0, 0, "unset header",
SLTH(Lost, HTTP_HDR_LOST, 0, 0, "lost header",
""
)
+/*lint -restore */
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 2ec667c..7ea599d 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -432,7 +432,6 @@ vsc_build_pt_list(struct VSM_data *vd)
vsc_delete_pt_list(vsc);
VTAILQ_FOREACH(vf, &vsc->vf_list, list) {
- /*lint -save -e525 -e539 */
#define VSC_DO(U,l,t) \
CHECK_OBJ_NOTNULL(vf, VSC_VF_MAGIC); \
if (!strcmp(vf->fantom.type, t)) \
@@ -443,7 +442,6 @@ vsc_build_pt_list(struct VSM_data *vd)
#undef VSC_DO
#undef VSC_F
#undef VSC_DONE
- /*lint -restore */
}
}
More information about the varnish-commit
mailing list