Source Format Enforcement (#763)

[thirdparty/squid.git] / src / HttpBody.cc

diff --git a/src/HttpBody.cc b/src/HttpBody.cc
index cbd03c6c9ca3891a346e30541fba87a1d79d22ba..adfff9d9f5dda67364a2cc12896d76e4be1e4645 100644 (file)
--- a/src/HttpBody.cc
+++ b/src/HttpBody.cc
@@ -1,76 +1,22 @@
-
 /*
- * $Id$
- *
- * DEBUG: section 56    HTTP Message Body
- * AUTHOR: Alex Rousskov
- *
- * 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-2021 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 "MemBuf.h"
-
-
-void
-httpBodyInit(HttpBody * body)
-{
-    body->mb = new MemBuf;
-}
-
-void
-httpBodyClean(HttpBody * body)
-{
-    assert(body);
-
-    if (!body->mb->isNull())
-        body->mb->clean();
-
-    delete body->mb;
+/* DEBUG: section 56    HTTP Message Body */
 
-    body->mb = NULL;
-}
+#include "squid.h"
+#include "base/Packable.h"
+#include "HttpBody.h"
 
-/* set body by absorbing mb */
 void
-httpBodySet(HttpBody * body, MemBuf * mb)
+HttpBody::packInto(Packable * p) const
 {
-    assert(body);
-    assert(body->mb->isNull());
-    delete body->mb;
-    body->mb = mb;             /* absorb */
+    assert(p);
+    if (const auto size = contentSize())
+        p->append(content(), size);
 }
 
-void
-httpBodyPackInto(const HttpBody * body, Packer * p)
-{
-    assert(body && p);
-
-    if (body->mb->contentSize())
-        packerAppend(p, body->mb->content(), body->mb->contentSize());
-}