From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 22 Sep 2015 17:29:23 +0000 (+0200)
Subject: Portbility fix: filter register keyword from gperf output
X-Git-Tag: SQUID_4_0_1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59f98fdbc8208767dedf86e6f69ea72ff60cf97d;p=thirdparty%2Fsquid.git

Portbility fix: filter register keyword from gperf output
---

diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index 93a52b2477..771cf08904 100644
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -37,7 +37,7 @@ MethodType.cc: MethodType.h $(top_srcdir)/src/mk-string-arrays.awk
 CLEANFILES += MethodType.cc
 
 gperf-files: RegisteredHeadersHash.gperf
-	if test $(srcdir)/RegisteredHeadersHash.gperf -nt $(srcdir)/RegisteredHeadersHash.cci; then gperf --output-file=$(srcdir)/RegisteredHeadersHash.cci -m 100000 $(srcdir)/RegisteredHeadersHash.gperf; fi
+	if test $(srcdir)/RegisteredHeadersHash.gperf -nt $(srcdir)/RegisteredHeadersHash.cci; then gperf -m 100000 $(srcdir)/RegisteredHeadersHash.gperf | sed 's/register //g' > $(srcdir)/RegisteredHeadersHash.cci; fi
 
 EXTRA_DIST = RegisteredHeadersHash.gperf
 
diff --git a/src/http/RegisteredHeadersHash.cci b/src/http/RegisteredHeadersHash.cci
index 9f2672cd5b..104d880ac9 100644
--- a/src/http/RegisteredHeadersHash.cci
+++ b/src/http/RegisteredHeadersHash.cci
@@ -81,7 +81,7 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_MEMCMP
 #define GPERF_CASE_MEMCMP 1
 static int
-gperf_case_memcmp (register const char *s1, register const char *s2, register unsigned int n)
+gperf_case_memcmp (const char *s1, const char *s2, unsigned int n)
 {
     for (; n > 0;)
     {
@@ -107,7 +107,7 @@ public:
 };
 
 inline unsigned int
-HttpHeaderHashTable::HttpHeaderHash (register const char *str, register unsigned int len)
+HttpHeaderHashTable::HttpHeaderHash (const char *str, unsigned int len)
 {
     static const unsigned char asso_values[] =
     {
@@ -138,7 +138,7 @@ HttpHeaderHashTable::HttpHeaderHash (register const char *str, register unsigned
         114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
         114, 114, 114, 114, 114, 114
     };
-    register int hval = len;
+    int hval = len;
 
     switch (hval)
     {
@@ -360,16 +360,16 @@ static const struct HeaderTableRecord HttpHeaderDefinitionsTable[] =
 };
 
 const struct HeaderTableRecord *
-HttpHeaderHashTable::lookup (register const char *str, register unsigned int len)
+HttpHeaderHashTable::lookup (const char *str, unsigned int len)
 {
     if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-        register int key = HttpHeaderHash (str, len);
+        int key = HttpHeaderHash (str, len);
 
         if (key <= MAX_HASH_VALUE && key >= 0)
             if (len == lengthtable[key])
             {
-                register const char *s = HttpHeaderDefinitionsTable[key].name;
+                const char *s = HttpHeaderDefinitionsTable[key].name;
 
                 if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_memcmp (str, s, len))
                     return &HttpHeaderDefinitionsTable[key];