From 6893608ae2be5fad11e7f6d48f40150494fd90a0 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 21 Mar 2015 22:57:19 +0900
Subject: [PATCH] Use literal instead of computed value in token lookup

---
 genheaderfunc.py     |  2 +-
 genlibtokenlookup.py |  2 +-
 lib/nghttp2_http.c   | 16 ++++++++--------
 src/http2.cc         | 26 +++++++++++++-------------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/genheaderfunc.py b/genheaderfunc.py
index 1efe3ccf..d87d6e3f 100755
--- a/genheaderfunc.py
+++ b/genheaderfunc.py
@@ -77,7 +77,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
         print '''\
   case {}:'''.format(size)
         print '''\
-    switch (name[namelen - 1]) {'''
+    switch (name[{}]) {{'''.format(size - 1)
         for c in sorted(ents.keys()):
             headers = sorted(ents[c])
             print '''\
diff --git a/genlibtokenlookup.py b/genlibtokenlookup.py
index c396ec08..25591aa9 100755
--- a/genlibtokenlookup.py
+++ b/genlibtokenlookup.py
@@ -59,7 +59,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
         print '''\
   case {}:'''.format(size)
         print '''\
-    switch (name[namelen - 1]) {'''
+    switch (name[{}]) {{'''.format(size - 1)
         for c in sorted(ents.keys()):
             headers = sorted(ents[c])
             print '''\
diff --git a/lib/nghttp2_http.c b/lib/nghttp2_http.c
index 1cb0c1a8..ae49fd63 100644
--- a/lib/nghttp2_http.c
+++ b/lib/nghttp2_http.c
@@ -76,7 +76,7 @@ typedef enum {
 static int lookup_token(const uint8_t *name, size_t namelen) {
   switch (namelen) {
   case 2:
-    switch (name[namelen - 1]) {
+    switch (name[1]) {
     case 'e':
       if (streq("t", name, 1)) {
         return NGHTTP2_TOKEN_TE;
@@ -85,7 +85,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 4:
-    switch (name[namelen - 1]) {
+    switch (name[3]) {
     case 't':
       if (streq("hos", name, 3)) {
         return NGHTTP2_TOKEN_HOST;
@@ -94,7 +94,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 5:
-    switch (name[namelen - 1]) {
+    switch (name[4]) {
     case 'h':
       if (streq(":pat", name, 4)) {
         return NGHTTP2_TOKEN__PATH;
@@ -103,7 +103,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 7:
-    switch (name[namelen - 1]) {
+    switch (name[6]) {
     case 'd':
       if (streq(":metho", name, 6)) {
         return NGHTTP2_TOKEN__METHOD;
@@ -125,7 +125,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 10:
-    switch (name[namelen - 1]) {
+    switch (name[9]) {
     case 'e':
       if (streq("keep-aliv", name, 9)) {
         return NGHTTP2_TOKEN_KEEP_ALIVE;
@@ -144,7 +144,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 14:
-    switch (name[namelen - 1]) {
+    switch (name[13]) {
     case 'h':
       if (streq("content-lengt", name, 13)) {
         return NGHTTP2_TOKEN_CONTENT_LENGTH;
@@ -153,7 +153,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 16:
-    switch (name[namelen - 1]) {
+    switch (name[15]) {
     case 'n':
       if (streq("proxy-connectio", name, 15)) {
         return NGHTTP2_TOKEN_PROXY_CONNECTION;
@@ -162,7 +162,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 17:
-    switch (name[namelen - 1]) {
+    switch (name[16]) {
     case 'g':
       if (streq("transfer-encodin", name, 16)) {
         return NGHTTP2_TOKEN_TRANSFER_ENCODING;
diff --git a/src/http2.cc b/src/http2.cc
index 5921096c..fb72610a 100644
--- a/src/http2.cc
+++ b/src/http2.cc
@@ -403,7 +403,7 @@ int lookup_token(const std::string &name) {
 int lookup_token(const uint8_t *name, size_t namelen) {
   switch (namelen) {
   case 2:
-    switch (name[namelen - 1]) {
+    switch (name[1]) {
     case 'e':
       if (util::streq_l("t", name, 1)) {
         return HD_TE;
@@ -412,7 +412,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 3:
-    switch (name[namelen - 1]) {
+    switch (name[2]) {
     case 'a':
       if (util::streq_l("vi", name, 2)) {
         return HD_VIA;
@@ -421,7 +421,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 4:
-    switch (name[namelen - 1]) {
+    switch (name[3]) {
     case 'k':
       if (util::streq_l("lin", name, 3)) {
         return HD_LINK;
@@ -435,7 +435,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 5:
-    switch (name[namelen - 1]) {
+    switch (name[4]) {
     case 'h':
       if (util::streq_l(":pat", name, 4)) {
         return HD__PATH;
@@ -449,7 +449,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 6:
-    switch (name[namelen - 1]) {
+    switch (name[5]) {
     case 'e':
       if (util::streq_l("cooki", name, 5)) {
         return HD_COOKIE;
@@ -468,7 +468,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 7:
-    switch (name[namelen - 1]) {
+    switch (name[6]) {
     case 'c':
       if (util::streq_l("alt-sv", name, 6)) {
         return HD_ALT_SVC;
@@ -500,7 +500,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 8:
-    switch (name[namelen - 1]) {
+    switch (name[7]) {
     case 'n':
       if (util::streq_l("locatio", name, 7)) {
         return HD_LOCATION;
@@ -509,7 +509,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 10:
-    switch (name[namelen - 1]) {
+    switch (name[9]) {
     case 'e':
       if (util::streq_l("keep-aliv", name, 9)) {
         return HD_KEEP_ALIVE;
@@ -533,7 +533,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 13:
-    switch (name[namelen - 1]) {
+    switch (name[12]) {
     case 'l':
       if (util::streq_l("cache-contro", name, 12)) {
         return HD_CACHE_CONTROL;
@@ -542,7 +542,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 14:
-    switch (name[namelen - 1]) {
+    switch (name[13]) {
     case 'h':
       if (util::streq_l("content-lengt", name, 13)) {
         return HD_CONTENT_LENGTH;
@@ -556,7 +556,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 15:
-    switch (name[namelen - 1]) {
+    switch (name[14]) {
     case 'e':
       if (util::streq_l("accept-languag", name, 14)) {
         return HD_ACCEPT_LANGUAGE;
@@ -575,7 +575,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 16:
-    switch (name[namelen - 1]) {
+    switch (name[15]) {
     case 'n':
       if (util::streq_l("proxy-connectio", name, 15)) {
         return HD_PROXY_CONNECTION;
@@ -584,7 +584,7 @@ int lookup_token(const uint8_t *name, size_t namelen) {
     }
     break;
   case 17:
-    switch (name[namelen - 1]) {
+    switch (name[16]) {
     case 'e':
       if (util::streq_l("if-modified-sinc", name, 16)) {
         return HD_IF_MODIFIED_SINCE;