SourceFormat Enforcement

[thirdparty/squid.git] / src / http / RequestMethod.h

diff --git a/src/http/RequestMethod.h b/src/http/RequestMethod.h
index 14c075daeb9d684e2f9581129c3ff3718363892b..09878707d5b00b6bef45fab9e7715c8211fbb736 100644 (file)
--- a/src/http/RequestMethod.h
+++ b/src/http/RequestMethod.h
@@ -1,9 +1,17 @@
+/*
+ * Copyright (C) 1996-2017 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.
+ */
+
 #ifndef SQUID_HTTPREQUESTMETHOD_H
 #define SQUID_HTTPREQUESTMETHOD_H
 
 #include "http/forward.h"
 #include "http/MethodType.h"
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 class SquidConfig;
 
@@ -20,14 +28,9 @@ class HttpRequestMethod : public RefCountable
 public:
     HttpRequestMethod() : theMethod(Http::METHOD_NONE), theImage() {}
     HttpRequestMethod(Http::MethodType const aMethod) : theMethod(aMethod), theImage() {}
+    explicit HttpRequestMethod(const SBuf &);
 
-    /**
-     \param begin    string to convert to request method.
-     \param end      end of the method string (relative to begin). Use NULL if this is unknown.
-     *
-     \note DO NOT give end a default (ie NULL). That will cause silent char* conversion clashes.
-     */
-    HttpRequestMethod(char const * begin, char const * end);
+    void HttpRequestMethodXXX(char const *); // deprecated old c-string to SBuf converter.
 
     HttpRequestMethod & operator = (const HttpRequestMethod& aMethod) {
         theMethod = aMethod.theMethod;
@@ -120,3 +123,4 @@ operator << (std::ostream &os, HttpRequestMethod const &method)
 }
 
 #endif /* SQUID_HTTPREQUESTMETHOD_H */
+