You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/09/12 18:11:15 UTC
[trafficserver] 02/02: Improve clang-format for static arrays.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 8b9940addd8297fe94580104578c9150ef87ef4d
Author: James Peach <jp...@apache.org>
AuthorDate: Mon Sep 12 10:53:09 2016 -0700
Improve clang-format for static arrays.
---
proxy/hdrs/HdrToken.cc | 109 ++++++++++++++++++++++++++-----------------------
1 file changed, 57 insertions(+), 52 deletions(-)
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index d55f1e5..56a1c0d 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -107,56 +107,59 @@ static const char *_hdrtoken_strs[] = {
"CONNECT", "DELETE", "GET", "POST", "HEAD", "ICP_QUERY", "OPTIONS", "PURGE", "PUT", "TRACE", "PUSH",
// Header extensions
- "X-ID", "X-Forwarded-For", "TE", "Strict-Transport-Security", "100-continue"};
-
-static HdrTokenTypeBinding _hdrtoken_strs_type_initializers[] = {{"file", HDRTOKEN_TYPE_SCHEME},
- {"ftp", HDRTOKEN_TYPE_SCHEME},
- {"gopher", HDRTOKEN_TYPE_SCHEME},
- {"http", HDRTOKEN_TYPE_SCHEME},
- {"https", HDRTOKEN_TYPE_SCHEME},
- {"mailto", HDRTOKEN_TYPE_SCHEME},
- {"news", HDRTOKEN_TYPE_SCHEME},
- {"nntp", HDRTOKEN_TYPE_SCHEME},
- {"prospero", HDRTOKEN_TYPE_SCHEME},
- {"telnet", HDRTOKEN_TYPE_SCHEME},
- {"tunnel", HDRTOKEN_TYPE_SCHEME},
- {"wais", HDRTOKEN_TYPE_SCHEME},
- {"pnm", HDRTOKEN_TYPE_SCHEME},
- {"rtsp", HDRTOKEN_TYPE_SCHEME},
- {"rtspu", HDRTOKEN_TYPE_SCHEME},
- {"mms", HDRTOKEN_TYPE_SCHEME},
- {"mmsu", HDRTOKEN_TYPE_SCHEME},
- {"mmst", HDRTOKEN_TYPE_SCHEME},
- {"wss", HDRTOKEN_TYPE_SCHEME},
- {"ws", HDRTOKEN_TYPE_SCHEME},
-
- {"CONNECT", HDRTOKEN_TYPE_METHOD},
- {"DELETE", HDRTOKEN_TYPE_METHOD},
- {"GET", HDRTOKEN_TYPE_METHOD},
- {"HEAD", HDRTOKEN_TYPE_METHOD},
- {"ICP_QUERY", HDRTOKEN_TYPE_METHOD},
- {"OPTIONS", HDRTOKEN_TYPE_METHOD},
- {"POST", HDRTOKEN_TYPE_METHOD},
- {"PURGE", HDRTOKEN_TYPE_METHOD},
- {"PUT", HDRTOKEN_TYPE_METHOD},
- {"TRACE", HDRTOKEN_TYPE_METHOD},
- {"PUSH", HDRTOKEN_TYPE_METHOD},
-
- {"max-age", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"max-stale", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"min-fresh", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"must-revalidate", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"no-cache", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"no-store", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"no-transform", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"only-if-cached", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"private", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"proxy-revalidate", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"public", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"s-maxage", HDRTOKEN_TYPE_CACHE_CONTROL},
- {"need-revalidate-once", HDRTOKEN_TYPE_CACHE_CONTROL},
-
- {(char *)NULL, (HdrTokenType)0}};
+ "X-ID", "X-Forwarded-For", "TE", "Strict-Transport-Security", "100-continue",
+};
+
+static HdrTokenTypeBinding _hdrtoken_strs_type_initializers[] = {
+ {"file", HDRTOKEN_TYPE_SCHEME},
+ {"ftp", HDRTOKEN_TYPE_SCHEME},
+ {"gopher", HDRTOKEN_TYPE_SCHEME},
+ {"http", HDRTOKEN_TYPE_SCHEME},
+ {"https", HDRTOKEN_TYPE_SCHEME},
+ {"mailto", HDRTOKEN_TYPE_SCHEME},
+ {"news", HDRTOKEN_TYPE_SCHEME},
+ {"nntp", HDRTOKEN_TYPE_SCHEME},
+ {"prospero", HDRTOKEN_TYPE_SCHEME},
+ {"telnet", HDRTOKEN_TYPE_SCHEME},
+ {"tunnel", HDRTOKEN_TYPE_SCHEME},
+ {"wais", HDRTOKEN_TYPE_SCHEME},
+ {"pnm", HDRTOKEN_TYPE_SCHEME},
+ {"rtsp", HDRTOKEN_TYPE_SCHEME},
+ {"rtspu", HDRTOKEN_TYPE_SCHEME},
+ {"mms", HDRTOKEN_TYPE_SCHEME},
+ {"mmsu", HDRTOKEN_TYPE_SCHEME},
+ {"mmst", HDRTOKEN_TYPE_SCHEME},
+ {"wss", HDRTOKEN_TYPE_SCHEME},
+ {"ws", HDRTOKEN_TYPE_SCHEME},
+
+ {"CONNECT", HDRTOKEN_TYPE_METHOD},
+ {"DELETE", HDRTOKEN_TYPE_METHOD},
+ {"GET", HDRTOKEN_TYPE_METHOD},
+ {"HEAD", HDRTOKEN_TYPE_METHOD},
+ {"ICP_QUERY", HDRTOKEN_TYPE_METHOD},
+ {"OPTIONS", HDRTOKEN_TYPE_METHOD},
+ {"POST", HDRTOKEN_TYPE_METHOD},
+ {"PURGE", HDRTOKEN_TYPE_METHOD},
+ {"PUT", HDRTOKEN_TYPE_METHOD},
+ {"TRACE", HDRTOKEN_TYPE_METHOD},
+ {"PUSH", HDRTOKEN_TYPE_METHOD},
+
+ {"max-age", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"max-stale", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"min-fresh", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"must-revalidate", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"no-cache", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"no-store", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"no-transform", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"only-if-cached", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"private", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"proxy-revalidate", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"public", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"s-maxage", HDRTOKEN_TYPE_CACHE_CONTROL},
+ {"need-revalidate-once", HDRTOKEN_TYPE_CACHE_CONTROL},
+
+ {(char *)NULL, (HdrTokenType)0},
+};
static HdrTokenFieldInfo _hdrtoken_strs_field_initializers[] = {
{"Accept", MIME_SLOTID_ACCEPT, MIME_PRESENCE_ACCEPT, (HTIF_COMMAS | HTIF_MULTVALS)},
@@ -233,7 +236,8 @@ static HdrTokenFieldInfo _hdrtoken_strs_field_initializers[] = {
{"X-Forwarded-For", MIME_SLOTID_NONE, MIME_PRESENCE_NONE, (HTIF_COMMAS | HTIF_MULTVALS)},
{"Sec-WebSocket-Key", MIME_SLOTID_NONE, MIME_PRESENCE_NONE, HTIF_NONE},
{"Sec-WebSocket-Version", MIME_SLOTID_NONE, MIME_PRESENCE_NONE, HTIF_NONE},
- {NULL, 0, 0, 0}};
+ {NULL, 0, 0, 0},
+};
const char *_hdrtoken_strs_heap_f = NULL; // storage first byte
const char *_hdrtoken_strs_heap_l = NULL; // storage last byte
@@ -348,7 +352,8 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
"CONNECT", "DELETE", "GET", "POST", "HEAD", "ICP_QUERY", "OPTIONS", "PURGE", "PUT", "TRACE", "PUSH",
// Header extensions
- "X-ID", "X-Forwarded-For", "TE", "Strict-Transport-Security", "100-continue"};
+ "X-ID", "X-Forwarded-For", "TE", "Strict-Transport-Security", "100-continue",
+};
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.