Convert LogTags.cc to non-generated source

diff --git a/src/LogTags.cc b/src/LogTags.cc
new file mode 100644 (file)
index 0000000..bb483b2
--- /dev/null
+++ b/src/LogTags.cc
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
+#include "squid.h"
+#include "LogTags.h"
+
+// old deprecated tag strings
+const char * LogTags_str[] = {
+       "TAG_NONE",
+       "TCP_HIT",
+       "TCP_MISS",
+       "TCP_REFRESH_UNMODIFIED",
+       "TCP_REFRESH_FAIL_OLD",
+       "TCP_REFRESH_FAIL_ERR",
+       "TCP_REFRESH_MODIFIED",
+       "TCP_CLIENT_REFRESH_MISS",
+       "TCP_IMS_HIT",
+       "TCP_SWAPFAIL_MISS",
+       "TCP_NEGATIVE_HIT",
+       "TCP_MEM_HIT",
+       "TCP_DENIED",
+       "TCP_DENIED_REPLY",
+       "TCP_OFFLINE_HIT",
+       "TCP_REDIRECT",
+       "TCP_TUNNEL",
+       "UDP_HIT",
+       "UDP_MISS",
+       "UDP_DENIED",
+       "UDP_INVALID",
+       "UDP_MISS_NOFETCH",
+       "ICP_QUERY",
+       "TYPE_MAX"
+};

diff --git a/src/Makefile.am b/src/Makefile.am
index ecc95486a9fb86c4e04cef6bfd1adad60d4b7fe7..322941399a6fc3402a741f644b9dc802466a8f3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -417,6 +417,7 @@ squid_SOURCES = \
        $(LEAKFINDERSOURCE) \
        SquidList.h \
        SquidList.cc \
+       LogTags.cc \
        LogTags.h \
        lookup_t.h \
        main.cc \
@@ -581,7 +582,6 @@ BUILT_SOURCES = \
        globals.cc \
        hier_code.cc \
        icp_opcode.cc \
-       LogTags.cc \
        lookup_t.cc \
        repl_modules.cc \
        swap_log_op.cc
@@ -927,9 +927,6 @@ err_type.cc: err_type.h mk-string-arrays.awk
 err_detail_type.cc: err_detail_type.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_detail_type.h | sed 's/ERR_DETAIL_//' > $@ || ($(RM) -f $@ && exit 1)
 
-LogTags.cc: LogTags.h mk-string-arrays.awk
-       $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/LogTags.h | sed 's/LOG_//' > $@ || ($(RM) -f $@ && exit 1)
-
 lookup_t.cc: lookup_t.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
 
@@ -1470,6 +1467,7 @@ tests_testCacheManager_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -1907,6 +1905,7 @@ tests_testEvent_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -2152,6 +2151,7 @@ tests_testEventLoop_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -2392,6 +2392,7 @@ tests_test_http_range_SOURCES = \
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -2687,6 +2688,7 @@ tests_testHttpRequest_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
@@ -3503,6 +3505,7 @@ tests_testURL_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       LogTags.cc \
        tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \