SourceFormat Enforcement

[thirdparty/squid.git] / test-suite / test_tools.cc

diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc
index 8a3c73d4c831054dc1d249377dd3587337590216..009833c5027c20a7474781e55f2e6a73ce213a50 100644 (file)
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@ -1,42 +1,17 @@
-
 /*
- * $Id: test_tools.cc,v 1.5 2004/08/30 03:29:03 robertc Exp $
- *
- * AUTHOR: Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-#define _SQUID_EXTERNNEW_
+// XXX: This file is made of large pieces of src/tools.cc
+// with only a few minor modifications. TODO: redesign or delete.
+
 #include "squid.h"
+#include "dlink.h"
 #include <iostream>
-#include <sstream>
 
 void
 xassert(const char *msg, const char *file, int line)
@@ -45,144 +20,10 @@ xassert(const char *msg, const char *file, int line)
     exit (1);
 }
 
-int Debug::Levels[MAX_DEBUG_SECTIONS];
-int Debug::level;
-
-static void
-_db_print_stderr(const char *format, va_list args);
-
-void
-#if STDC_HEADERS
-_db_print(const char *format,...)
-{
-#else
-_db_print(va_alist)
-va_dcl
-{
-    const char *format = NULL;
-#endif
-
-    LOCAL_ARRAY(char, f, BUFSIZ);
-    va_list args1;
-#if STDC_HEADERS
-
-    va_list args2;
-    va_list args3;
-#else
-#define args2 args1
-#define args3 args1
-#endif
-
-#if STDC_HEADERS
-
-    va_start(args1, format);
-
-    va_start(args2, format);
-
-    va_start(args3, format);
-
-#else
-
-    format = va_arg(args1, const char *);
-
-#endif
-
-    snprintf(f, BUFSIZ, "%s| %s",
-             "stub time", //debugLogTime(squid_curtime),
-             format);
-
-    _db_print_stderr(f, args2);
-
-    va_end(args1);
-
-#if STDC_HEADERS
-
-    va_end(args2);
-
-    va_end(args3);
-
-#endif
-}
-
-static void
-_db_print_stderr(const char *format, va_list args) {
-    /* FIXME? */
-   // if (opt_debug_stderr < Debug::level)
-   if (1 < Debug::level)
-        return;
-
-    vfprintf(stderr, format, args);
-}
-
-void
-fatal(const char *message) {
-    debug (0,0) ("Fatal: %s",message);
-    exit (1);
-}
-
-/* used by fatalf */
-static void
-fatalvf(const char *fmt, va_list args) {
-    static char fatal_str[BUFSIZ];
-    vsnprintf(fatal_str, sizeof(fatal_str), fmt, args);
-    fatal(fatal_str);
-}
-
-/* printf-style interface for fatal */
-#if STDC_HEADERS
-void
-fatalf(const char *fmt,...)
-{
-    va_list args;
-    va_start(args, fmt);
-#else
-void
-fatalf(va_alist)
-va_dcl
-{
-    va_list args;
-    const char *fmt = NULL;
-    va_start(args);
-    fmt = va_arg(args, char *);
-#endif
-
-    fatalvf(fmt, args);
-    va_end(args);
-}
-
-void
-debug_trap(const char *message) {
-    fatal(message);
-}
-
-std::ostream &
-Debug::getDebugOut()
-{
-    assert (CurrentDebug == NULL);
-    CurrentDebug = new std::ostringstream();
-    return *CurrentDebug;
-}
-
-void
-Debug::finishDebug()
-{
-    _db_print("%s\n", CurrentDebug->str().c_str());
-    delete CurrentDebug;
-    CurrentDebug = NULL;
-}
-
-std::ostringstream *Debug::CurrentDebug (NULL);
-
-MemPool *dlink_node_pool = NULL;
-
 dlink_node *
 dlinkNodeNew()
 {
-    if (dlink_node_pool == NULL)
-        dlink_node_pool = memPoolCreate("Dlink list nodes", sizeof(dlink_node));
-
-    /* where should we call memPoolDestroy(dlink_node_pool); */
-    return (dlink_node *)memPoolAlloc(dlink_node_pool);
+    return new dlink_node;
 }
 
 /* the node needs to be unlinked FIRST */
@@ -192,7 +33,7 @@ dlinkNodeDelete(dlink_node * m)
     if (m == NULL)
         return;
 
-    memPoolFree(dlink_node_pool, m);
+    delete m;
 }
 
 void