You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2022/10/11 23:09:34 UTC
[trafficserver] branch 9.1.x updated: 9.1.x: Fix GCC 12 compiler warnings (#9135)
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new 804af1232 9.1.x: Fix GCC 12 compiler warnings (#9135)
804af1232 is described below
commit 804af1232e34a242014c82bee0e79fb50dc919b5
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Oct 11 18:09:28 2022 -0500
9.1.x: Fix GCC 12 compiler warnings (#9135)
* Fix Clang 13.0.1 and GCC 12.0.1 Compiler Warnings (#8690)
This cherry-picks two commits from master:
Fix Clang 13.0.1 compiler warnings (#8685)
This fixes a couple compiler warnings raised by Clang 13.0.1.
(cherry picked from commit 96ce993fa53a05b872c5041629e3aac0bc15d56d)
Fix warnings from GCC 12.0.1 (#8684)
This patch fixes warnings generated by GCC 12.0.1. The warnings involved the
use of the deprecated std::binary_function, std::unary_function, and
std::iterator interfaces. The use of these was considered more confusing than
explicitly declaring the associated types. Therefore this patch replaces the
use of these deprecated interfaces with the declaration of the associated
types.
(cherry picked from commit 0ae34d4d1699d978f6938027efb2ecb9ae05c89a)
(cherry picked from commit 1a37ae9efaf40ee19e3a735828c03ed25eac6a4f)
* LogFilter: fix NULL termination check (#8603)
gcc-12 generated the following warning:
proxy/logging/LogFilter.h: In function 'void wipeField(char**, char*, const char*)':
proxy/logging/LogFilter.h:477:35: error: comparing the result of pointer addition '(new_param + 1)' and NULL [-Werror=address]
477 | if (new_param && (new_param + 1)) {
| ~~~~~~~~~~~^~~~
That is indeed a bug. `new_param + 1` will always be non-NULL even if new_param
is NULL because 1 will be added to it. The intention was to check for the
string's null terminator at the offset, which is done via a dereference.
(cherry picked from commit 9966c9b8210ade388598aa42ac49f960126bfff7)
---
example/plugins/cpp-api/boom/boom.cc | 5 ++++-
include/tscore/IntrusivePtr.h | 6 +++++-
include/tscpp/api/Headers.h | 10 ++++++++--
iocore/net/quic/QUICFrame.h | 5 ++++-
iocore/net/quic/QUICVersionNegotiator.cc | 2 --
proxy/logging/LogFilter.h | 2 +-
src/tscore/HostLookup.cc | 6 +++++-
src/wccp/WccpMeta.h | 6 +++++-
8 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/example/plugins/cpp-api/boom/boom.cc b/example/plugins/cpp-api/boom/boom.cc
index a312e7f20..7a3a3234d 100644
--- a/example/plugins/cpp-api/boom/boom.cc
+++ b/example/plugins/cpp-api/boom/boom.cc
@@ -98,13 +98,16 @@ GlobalPlugin *plugin;
// Functor that decides whether the HTTP error can be rewritten or not.
// Rewritable codes are: 2xx, 3xx, 4xx, 5xx and 6xx.
// 1xx is NOT rewritable!
-class IsRewritableCode : public std::unary_function<std::string, bool>
+class IsRewritableCode
{ // could probably be replaced with mem_ptr_fun()..
private:
int current_code_;
std::string current_code_string_;
public:
+ using argument_type = std::string;
+ using result_type = bool;
+
explicit IsRewritableCode(int current_code) : current_code_(current_code)
{
std::ostringstream oss;
diff --git a/include/tscore/IntrusivePtr.h b/include/tscore/IntrusivePtr.h
index bfe63a3ae..70cc671e3 100644
--- a/include/tscore/IntrusivePtr.h
+++ b/include/tscore/IntrusivePtr.h
@@ -330,9 +330,13 @@ public:
static void finalize(T *t);
/// Strict weak order for STL containers.
- class Order : public std::binary_function<IntrusivePtr<T>, IntrusivePtr<T>, bool>
+ class Order
{
public:
+ using first_argument_type = IntrusivePtr<T>;
+ using second_argument_type = IntrusivePtr<T>;
+ using result_type = bool;
+
/// Default constructor.
Order() {}
/// Compare by raw pointer.
diff --git a/include/tscpp/api/Headers.h b/include/tscpp/api/Headers.h
index 9e6daea8e..ffaffde81 100644
--- a/include/tscpp/api/Headers.h
+++ b/include/tscpp/api/Headers.h
@@ -109,12 +109,15 @@ class HeaderField;
/**
* @brief A header field value iterator iterates through all header fields.
*/
-class header_field_value_iterator : public std::iterator<std::forward_iterator_tag, int>
+class header_field_value_iterator
{
private:
HeaderFieldValueIteratorState *state_;
public:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = int;
+
/**
* Constructor for header_field_value_iterator, this shouldn't need to be used directly.
* @param bufp the TSMBuffer associated with the headers
@@ -169,13 +172,16 @@ public:
/**
* @brief A header field iterator is an iterator that dereferences to a HeaderField.
*/
-class header_field_iterator : public std::iterator<std::forward_iterator_tag, int>
+class header_field_iterator
{
private:
HeaderFieldIteratorState *state_;
header_field_iterator(void *hdr_buf, void *hdr_loc, void *field_loc);
public:
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = int;
+
~header_field_iterator();
/**
diff --git a/iocore/net/quic/QUICFrame.h b/iocore/net/quic/QUICFrame.h
index 93cd692fc..a0b4af907 100644
--- a/iocore/net/quic/QUICFrame.h
+++ b/iocore/net/quic/QUICFrame.h
@@ -204,9 +204,12 @@ public:
class AckBlockSection
{
public:
- class const_iterator : public std::iterator<std::input_iterator_tag, QUICAckFrame::AckBlock>
+ class const_iterator
{
public:
+ using iterator_category = std::input_iterator_tag;
+ using value_type = QUICAckFrame::AckBlock;
+
const_iterator(uint8_t index, const std::vector<QUICAckFrame::AckBlock> *ack_blocks);
const QUICAckFrame::AckBlock &
diff --git a/iocore/net/quic/QUICVersionNegotiator.cc b/iocore/net/quic/QUICVersionNegotiator.cc
index 43d2fbf56..d26f4f883 100644
--- a/iocore/net/quic/QUICVersionNegotiator.cc
+++ b/iocore/net/quic/QUICVersionNegotiator.cc
@@ -46,11 +46,9 @@ QUICVersionNegotiator::negotiate(const QUICPacket &packet)
case QUICPacketType::VERSION_NEGOTIATION: {
const QUICVersionNegotiationPacketR &vn_packet = static_cast<const QUICVersionNegotiationPacketR &>(packet);
uint16_t n_supported_version = vn_packet.nversions();
- uint16_t len = 0;
for (int i = 0; i < n_supported_version; ++i) {
QUICVersion version = vn_packet.supported_version(i);
- len += sizeof(QUICVersion);
if (QUICTypeUtil::is_supported_version(version)) {
this->_status = QUICVersionNegotiationStatus::NEGOTIATED;
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 083dc08e6..749c044e5 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -474,7 +474,7 @@ wipeField(char **field, char *pattern, const char *uppercase_field)
// search new param again
const char *new_param = strchr(lookup_query_param + field_pos, '&');
- if (new_param && (new_param + 1)) {
+ if (new_param && *(new_param + 1)) {
pattern_in_param_name = findPatternFromParamName(new_param + 1, pattern);
} else {
break;
diff --git a/src/tscore/HostLookup.cc b/src/tscore/HostLookup.cc
index b695e0f47..440474e94 100644
--- a/src/tscore/HostLookup.cc
+++ b/src/tscore/HostLookup.cc
@@ -231,7 +231,11 @@ struct CharIndexBlock {
class CharIndex
{
public:
- struct iterator : public std::iterator<std::forward_iterator_tag, HostBranch, int> {
+ struct iterator {
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = HostBranch;
+ using difference_type = int;
+
using self_type = iterator;
struct State {
diff --git a/src/wccp/WccpMeta.h b/src/wccp/WccpMeta.h
index 464e8bafc..11a9b09cf 100644
--- a/src/wccp/WccpMeta.h
+++ b/src/wccp/WccpMeta.h
@@ -54,7 +54,11 @@ template <bool VALUE> struct TEST_IF_TRUE : public TEST_RESULT<TEST_BOOL<VALUE>>
};
// Helper for assigning a value to all instances in a container.
-template <typename T, typename R, typename A1> struct TsAssignMember : public std::binary_function<T, A1, R> {
+template <typename T, typename R, typename A1> struct TsAssignMember {
+ using first_argument_type = T;
+ using second_argument_type = A1;
+ using result_type = R;
+
R T::*_m;
A1 _arg1;
TsAssignMember(R T::*m, A1 const &arg1) : _m(m), _arg1(arg1) {}