From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 25 Feb 2016 18:01:29 +0000 (+0100)
Subject: Implement audit suggestions
X-Git-Tag: SQUID_4_0_8~60^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88b141d44de0a1ba8b6cfc4aeb2d58c6f341a3d6;p=thirdparty%2Fsquid.git

Implement audit suggestions
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 54d97d0466..892bb0075e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3564,7 +3564,8 @@ tests_testSBuf_LDADD= \
 	base/libbase.la \
 	$(SQUID_CPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
-	$(XTRA_LIBS)
+	$(XTRA_LIBS) \
+	$(SQUID_CPPUNIT_LA)
 
 tests_testSBufList_SOURCES= \
 	tests/testSBufList.h \
@@ -3581,7 +3582,8 @@ tests_testSBufList_LDADD=\
 	base/libbase.la \
 	$(SQUID_CPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
-	$(XTRA_LIBS)
+	$(XTRA_LIBS) \
+	$(SQUID_CPPUNIT_LA)
 
 tests_testConfigParser_SOURCES = \
 	ClientInfo.h \
@@ -3675,7 +3677,8 @@ tests_testLookupTable_LDADD = \
 	base/libbase.la \
 	$(SQUID_CPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
-	$(XTRA_LIBS)
+	$(XTRA_LIBS) \
+	$(SQUID_CPPUNIT_LA)
 
 tests_testEnumIterator_SOURCES = \
 	base/EnumIterator.h \
diff --git a/src/mk-string-arrays.awk b/src/mk-string-arrays.awk
index 18b879296d..11492cc198 100644
--- a/src/mk-string-arrays.awk
+++ b/src/mk-string-arrays.awk
@@ -76,7 +76,7 @@ END {
 	if (sbuf) print "#include \"sbuf/SBuf.h\""
 	print "#include \"" nspath type ".h\""
 
-	# if namesapce is not empty ??
+	# if namespace is not empty ??
 	if (namespace) print "namespace " namespace
 	if (namespace) print "{"
 
diff --git a/src/sbuf/SBufStringConvert.h b/src/sbuf/SBufStringConvert.h
index 4b738f1e8d..57ea43c575 100644
--- a/src/sbuf/SBufStringConvert.h
+++ b/src/sbuf/SBufStringConvert.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SRC_SBUF_SBUFSTRING_H_
 #define SQUID_SRC_SBUF_SBUFSTRING_H_
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 #include "SquidString.h"
 
 /// create a new SBuf from a String by copying contents
diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 4adf3e2a60..a6f3f85aba 100644
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -10,7 +10,7 @@
 #include "base/CharacterSet.h"
 #include "sbuf/SBuf.h"
 #include "sbuf/SBufAlgos.h"
-#include "SBufFindTest.h"
+#include "tests/SBufFindTest.h"
 #include "sbuf/SBufStream.h"
 #include "tests/testSBuf.h"
 #include "unitTestMain.h"