You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2017/08/10 03:20:48 UTC

[trafficserver] 01/02: Fix build warnings on Fedora 26

This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 7ee8f3966b75092a5045fe0b9413368d20d17278
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Thu Aug 10 11:57:18 2017 +0900

    Fix build warnings on Fedora 26
---
 iocore/net/quic/QUICCongestionController.cc | 2 +-
 iocore/net/quic/QUICConnectionManager.cc    | 2 +-
 iocore/net/quic/QUICLossDetector.cc         | 6 +++---
 iocore/net/quic/QUICPacket.cc               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/iocore/net/quic/QUICCongestionController.cc b/iocore/net/quic/QUICCongestionController.cc
index 79df5d8..2584c35 100644
--- a/iocore/net/quic/QUICCongestionController.cc
+++ b/iocore/net/quic/QUICCongestionController.cc
@@ -33,7 +33,7 @@ QUICCongestionController::handle_frame(std::shared_ptr<const QUICFrame> frame)
   case QUICFrameType::ACK:
     break;
   default:
-    Debug(tag, "Unexpected frame type: %02x", frame->type());
+    Debug(tag, "Unexpected frame type: %02x", static_cast<unsigned int>(frame->type()));
     ink_assert(false);
     break;
   }
diff --git a/iocore/net/quic/QUICConnectionManager.cc b/iocore/net/quic/QUICConnectionManager.cc
index fc1240b..85654f2 100644
--- a/iocore/net/quic/QUICConnectionManager.cc
+++ b/iocore/net/quic/QUICConnectionManager.cc
@@ -35,7 +35,7 @@ QUICConnectionManager::handle_frame(std::shared_ptr<const QUICFrame> frame)
   case QUICFrameType::PING:
     break;
   default:
-    Debug(tag, "Unexpected frame type: %02x", frame->type());
+    Debug(tag, "Unexpected frame type: %02x", static_cast<unsigned int>(frame->type()));
     ink_assert(false);
     break;
   }
diff --git a/iocore/net/quic/QUICLossDetector.cc b/iocore/net/quic/QUICLossDetector.cc
index 4e2cdbf..f30d69a 100644
--- a/iocore/net/quic/QUICLossDetector.cc
+++ b/iocore/net/quic/QUICLossDetector.cc
@@ -34,7 +34,7 @@ QUICLossDetector::QUICLossDetector(QUICPacketTransmitter *transmitter) : _transm
   this->_tlp_count            = 0;
   this->_rto_count            = 0;
   if (this->_time_loss_detection) {
-    this->_reordering_threshold     = INFINITY;
+    this->_reordering_threshold     = UINT32_MAX;
     this->_time_reordering_fraction = this->_TIME_REORDERING_FRACTION;
   } else {
     this->_reordering_threshold     = this->_REORDERING_THRESHOLD;
@@ -80,7 +80,7 @@ QUICLossDetector::handle_frame(std::shared_ptr<const QUICFrame> frame)
     this->_on_ack_received(std::dynamic_pointer_cast<const QUICAckFrame>(frame));
     break;
   default:
-    Debug("quic_loss_detector", "Unexpected frame type: %02x", frame->type());
+    Debug("quic_loss_detector", "Unexpected frame type: %02x", static_cast<unsigned int>(frame->type()));
     ink_assert(false);
     break;
   }
@@ -188,7 +188,7 @@ void
 QUICLossDetector::_on_packet_acked(QUICPacketNumber acked_packet_number)
 {
   SCOPED_MUTEX_LOCK(lock, this->mutex, this_ethread());
-  Debug("quic_loss_detector", "Packet number %llu has been acked", acked_packet_number);
+  Debug("quic_loss_detector", "Packet number %" PRIu64 " has been acked", acked_packet_number);
   this->_largest_acked_packet = acked_packet_number;
   // If a packet sent prior to RTO was acked, then the RTO
   // was spurious.  Otherwise, inform congestion control.
diff --git a/iocore/net/quic/QUICPacket.cc b/iocore/net/quic/QUICPacket.cc
index 135dd85..8b41218 100644
--- a/iocore/net/quic/QUICPacket.cc
+++ b/iocore/net/quic/QUICPacket.cc
@@ -636,7 +636,7 @@ QUICPacketFactory::create_server_protected_packet(QUICConnectionId connection_id
   if (this->_crypto->encrypt(cipher_txt.get(), cipher_txt_len, max_cipher_txt_len, packet->payload(), packet->payload_size(),
                              packet->packet_number(), ad, ad_len, packet->key_phase())) {
     packet->set_protected_payload(std::move(cipher_txt), cipher_txt_len);
-    Debug("quic_packet_factory", "Encrypt Packet, pkt_num: %llu, header_len: %zu payload: %zu", packet->packet_number(), ad_len,
+    Debug("quic_packet_factory", "Encrypt Packet, pkt_num: %" PRIu64 ", header_len: %zu payload: %zu", packet->packet_number(), ad_len,
           cipher_txt_len);
     return packet;
   } else {

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.