Implement audit suggestions

diff --git a/src/Makefile.am b/src/Makefile.am
index 54d97d046605603fa77399738859fdc2ff71427c..892bb0075e4b5695ae8a6f2a9c36989b7051c331 100644 (file)
--- 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 18b879296d1798cb411b5693832d5d3cc1d5d1bf..11492cc19849ccccd2bc2cff50992874be73631e 100644 (file)
--- 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 4b738f1e8d36fc2a342ad3b43c3579e466e64f31..57ea43c575fbf2b76d8cd938a6d9efe5fac3134b 100644 (file)
--- 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 4adf3e2a60aca71885eec1e41d121957ddcd8cca..a6f3f85aba8a5612307db2d4cdf9e5c756d9209a 100644 (file)
--- 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"