From 7080c9ea3c761f4ac67e3341bbc371383e4e739b Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 14 Feb 2024 03:07:20 +1300 Subject: [PATCH 1/4] Fix undefined std::find --- src/helper/Reply.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/helper/Reply.cc b/src/helper/Reply.cc index 93cd5c84322..2e5e92aa2be 100644 --- a/src/helper/Reply.cc +++ b/src/helper/Reply.cc @@ -17,6 +17,8 @@ #include "rfc1738.h" #include "SquidString.h" +#include + Helper::Reply::Reply() : result(Helper::Unknown) { From 906884bf2565025cbc5b322c47425defa07f1f8e Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 14 Feb 2024 03:51:17 +1300 Subject: [PATCH 2/4] Fix error: 'InstanceId<...>::InstanceId(const InstanceId<...> &)' is private within this context --- src/base/InstanceId.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/base/InstanceId.h b/src/base/InstanceId.h index a48be882cc4..c4dd4090b00 100644 --- a/src/base/InstanceId.h +++ b/src/base/InstanceId.h @@ -49,6 +49,7 @@ class InstanceId typedef ValueType Value; ///< id storage type InstanceId() {change();} + InstanceId(const InstanceId &); ///< no copying; IDs are unique operator Value() const { return value; } bool operator ==(const InstanceId &o) const { return value == o.value; } @@ -67,10 +68,6 @@ class InstanceId public: Value value = Value(); ///< instance identifier - -private: - InstanceId(const InstanceId &); ///< not implemented; IDs are unique - InstanceId& operator=(const InstanceId &); ///< not implemented }; /// An InstanceIdDefinitions() helper. Avoid direct use. From 2631e20bf8adc2102ba039baf86c1c64c158431f Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 14 Feb 2024 03:58:47 +1300 Subject: [PATCH 3/4] =?UTF-8?q?Fix=20error:=20=E2=80=98void*=20calloc(size?= =?UTF-8?q?=5Ft,=20size=5Ft)=E2=80=99=20sizes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] --- src/auth/basic/LDAP/basic_ldap_auth.cc | 2 +- src/auth/digest/eDirectory/edir_ldapext.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/auth/basic/LDAP/basic_ldap_auth.cc b/src/auth/basic/LDAP/basic_ldap_auth.cc index 4d9a78574cb..f79a5b88984 100644 --- a/src/auth/basic/LDAP/basic_ldap_auth.cc +++ b/src/auth/basic/LDAP/basic_ldap_auth.cc @@ -795,7 +795,7 @@ readSecret(const char *filename) if ((e = strrchr(buf, '\r'))) *e = 0; - passwd = (char *) calloc(sizeof(char), strlen(buf) + 1); + passwd = static_cast(calloc(strlen(buf) + 1, sizeof(char))); if (!passwd) { fprintf(stderr, PROGRAM_NAME " ERROR: can not allocate memory\n"); exit(EXIT_FAILURE); diff --git a/src/auth/digest/eDirectory/edir_ldapext.cc b/src/auth/digest/eDirectory/edir_ldapext.cc index f34341c912c..13e7daca67b 100644 --- a/src/auth/digest/eDirectory/edir_ldapext.cc +++ b/src/auth/digest/eDirectory/edir_ldapext.cc @@ -69,7 +69,7 @@ #define NMAS_LDAP_EXT_VERSION 1 -#define SMB_MALLOC_ARRAY(type, nelem) calloc(sizeof(type), nelem) +#define SMB_MALLOC_ARRAY(type, nelem) calloc(nelem, sizeof(type)) #define DEBUG(level, args) /********************************************************************** From 535606d99e04f3479af07c471768af688ff790cb Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 14 Feb 2024 05:52:05 +1300 Subject: [PATCH 4/4] Update src/base/InstanceId.h Co-authored-by: Alex Rousskov --- src/base/InstanceId.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/InstanceId.h b/src/base/InstanceId.h index c4dd4090b00..d3e2ebb2b2e 100644 --- a/src/base/InstanceId.h +++ b/src/base/InstanceId.h @@ -49,7 +49,7 @@ class InstanceId typedef ValueType Value; ///< id storage type InstanceId() {change();} - InstanceId(const InstanceId &); ///< no copying; IDs are unique + InstanceId(InstanceId &&) = delete; // no copying/moving of any kind operator Value() const { return value; } bool operator ==(const InstanceId &o) const { return value == o.value; }