Maintenance: rework SASL detection (#1694)

[thirdparty/squid.git] / src / store_key_md5.h

diff --git a/src/store_key_md5.h b/src/store_key_md5.h
index 0cdce573b8ead9f9a17c9e58efed373a7bf4033c..85702169c803d883cdc7534c4fc7de1c8ac880ee 100644 (file)
--- a/src/store_key_md5.h
+++ b/src/store_key_md5.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * 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.
@@ -8,30 +8,31 @@
 
 /* DEBUG: section 20    Storage Manager MD5 Cache Keys */
 
-#ifndef SQUID_STORE_KEY_MD5_H_
-#define SQUID_STORE_KEY_MD5_H_
+#ifndef SQUID_SRC_STORE_KEY_MD5_H
+#define SQUID_SRC_STORE_KEY_MD5_H
 
 #include "hash.h"
-#include "typedefs.h"
+#include "http/forward.h"
+#include "store/forward.h"
 
-class HttpRequestMethod;
-class HttpRequest;
+typedef enum {
+    ksDefault = 0,
+    ksRevalidation
+} KeyScope;
 
 cache_key *storeKeyDup(const cache_key *);
 cache_key *storeKeyCopy(cache_key *, const cache_key *);
 void storeKeyFree(const cache_key *);
 const cache_key *storeKeyScan(const char *);
 const char *storeKeyText(const cache_key *);
-const cache_key *storeKeyPublic(const char *, const HttpRequestMethod&);
-const cache_key *storeKeyPublicByRequest(HttpRequest *);
-const cache_key *storeKeyPublicByRequestMethod(HttpRequest *, const HttpRequestMethod&);
-const cache_key *storeKeyPrivate(const char *, const HttpRequestMethod&, int);
+const cache_key *storeKeyPublic(const char *, const HttpRequestMethod&, const KeyScope keyScope = ksDefault);
+const cache_key *storeKeyPublicByRequest(HttpRequest *, const KeyScope keyScope = ksDefault);
+const cache_key *storeKeyPublicByRequestMethod(HttpRequest *, const HttpRequestMethod&, const KeyScope keyScope = ksDefault);
+const cache_key *storeKeyPrivate();
 int storeKeyHashBuckets(int);
-int storeKeyNull(const cache_key *);
-void storeKeyInit(void);
 
 extern HASHHASH storeKeyHashHash;
 extern HASHCMP storeKeyHashCmp;
 
-#endif /* SQUID_STORE_KEY_MD5_H_ */
+#endif /* SQUID_SRC_STORE_KEY_MD5_H */