Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / esi / Assign.cc

diff --git a/src/esi/Assign.cc b/src/esi/Assign.cc
index 6b5aed741e402e56303934817ab1dd3d2924b5ef..8fb062705e1ccb2a6011d73884779ec02439b0cf 100644 (file)
--- a/src/esi/Assign.cc
+++ b/src/esi/Assign.cc
@@ -1,38 +1,13 @@
-
 /*
- * $Id$
- *
- * DEBUG: section 86    ESI processing
- * 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.
- *
- *  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) 1996-2023 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.
  */
 
+/* DEBUG: section 86    ESI processing */
+
 #include "squid.h"
 
 /* MS Visual Studio Projects are monolithic, so we need the following
@@ -43,6 +18,7 @@
 #include "esi/Assign.h"
 #include "esi/Context.h"
 #include "esi/Sequence.h"
+#include "HttpReply.h"
 
 ESIAssign::~ESIAssign()
 {
@@ -50,10 +26,10 @@ ESIAssign::~ESIAssign()
         delete value;
 }
 
-ESIAssign::ESIAssign (ESIAssign const &old) : parent (NULL), varState (NULL), name (old.name), value (old.value ? new ESIVariableExpression (*old.value): NULL), variable (NULL), unevaluatedVariable(old.unevaluatedVariable)
+ESIAssign::ESIAssign (ESIAssign const &old) : parent (nullptr), varState (nullptr), name (old.name), value (old.value ? new ESIVariableExpression (*old.value): nullptr), variable (nullptr), unevaluatedVariable(old.unevaluatedVariable)
 {}
 
-ESIAssign::ESIAssign (esiTreeParentPtr aParent, int attrcount, char const **attr, ESIContext *aContext) : parent (aParent), varState (NULL), name(), value (NULL), variable (NULL), unevaluatedVariable()
+ESIAssign::ESIAssign (esiTreeParentPtr aParent, int attrcount, char const **attr, ESIContext *aContext) : parent (aParent), varState (nullptr), name(), value (nullptr), variable (nullptr), unevaluatedVariable()
 {
     /* TODO: grab content IFF no value was specified */
     assert (aContext);
@@ -86,7 +62,7 @@ ESIAssign::evaluateVariable()
     if (variable.getRaw())
         variable->process (false);
 
-    variable = NULL;
+    variable = nullptr;
 
     if (unevaluatedVariable.size()) {
         varState->feedData(unevaluatedVariable.rawBuf(), unevaluatedVariable.size());
@@ -113,7 +89,7 @@ ESIAssign::provideData (ESISegment::Pointer data, ESIElement * source)
 }
 
 esiProcessResult_t
-ESIAssign::process (int dovars)
+ESIAssign::process (int)
 {
     assert (varState);
 
@@ -125,7 +101,7 @@ ESIAssign::process (int dovars)
 
     varState->addVariable (name.rawBuf(), name.size(), value);
 
-    value = NULL;
+    value = nullptr;
 
     debugs(86, 5, "ESIAssign: Processed " << this);
 
@@ -167,7 +143,7 @@ ESIAssign::finish()
         cbdataReferenceDone (varState);
 
     if (parent.getRaw())
-        parent = NULL;
+        parent = nullptr;
 }
 
 bool
@@ -191,10 +167,11 @@ ESIVariableExpression::ESIVariableExpression (String const &aString) : expressio
 {}
 
 void
-ESIVariableExpression::eval (ESIVarState &state, char const *subref, char const *defaultOnEmpty) const
+ESIVariableExpression::eval (ESIVarState &state, char const *, char const *) const
 {
     /* XXX: Implement evaluation of the expression */
     ESISegment::ListAppend (state.getOutput(), expression.rawBuf(), expression.size());
 }
 
 #endif /* USE_SQUID_ESI == 1 */
+