commit 84eac5192166bbe69bf4e224b98a8030701537de
author vasilvv <vasilvv@google.com> Mon May 09 12:11:24 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 09 12:12:09 2022 -0700
tree be41dff3a4590296db9d76de408942ed80417cd4
parent bf9fc68309dbf9b46e6a02f98999fb98eb14a27e

Use QUICHE versions of logging macros in certain QUICHE files.

PiperOrigin-RevId: 447532267

quiche/common/structured_headers.cc

diff --git a/quiche/common/structured_headers.cc b/quiche/common/structured_headers.cc
index 6aca4d0..f19d15c 100644
--- a/quiche/common/structured_headers.cc
+++ b/quiche/common/structured_headers.cc
@@ -147,7 +147,7 @@
   // for parsing an Item from [SH09] 4.2.7).
   absl::optional<Item> ReadBareItem() {
     if (input_.empty()) {
-      DVLOG(1) << "ReadBareItem: unexpected EOF";
+      QUICHE_DVLOG(1) << "ReadBareItem: unexpected EOF";
       return absl::nullopt;
     }
     switch (input_.front()) {
@@ -234,8 +234,8 @@
         value = std::move(*item);
       }
       if (!parameters.emplace(*name, value).second) {
-        DVLOG(1) << "ReadParameterisedIdentifier: duplicated parameter: "
-                 << *name;
+        QUICHE_DVLOG(1) << "ReadParameterisedIdentifier: duplicated parameter: "
+                        << *name;
         return absl::nullopt;
       }
       SkipWhitespaces();
@@ -426,24 +426,24 @@
       size_t i = 0;
       for (; i < input_.size(); ++i) {
         if (!absl::ascii_isprint(input_[i])) {
-          DVLOG(1) << "ReadString: non printable-ASCII character";
+          QUICHE_DVLOG(1) << "ReadString: non printable-ASCII character";
           return absl::nullopt;
         }
         if (input_[i] == '"' || input_[i] == '\\') break;
       }
       if (i == input_.size()) {
-        DVLOG(1) << "ReadString: missing closing '\"'";
+        QUICHE_DVLOG(1) << "ReadString: missing closing '\"'";
         return absl::nullopt;
       }
       s.append(std::string(input_.substr(0, i)));
       input_.remove_prefix(i);
       if (ConsumeChar('\\')) {
         if (input_.empty()) {
-          DVLOG(1) << "ReadString: backslash at string end";
+          QUICHE_DVLOG(1) << "ReadString: backslash at string end";
           return absl::nullopt;
         }
         if (input_[0] != '"' && input_[0] != '\\') {
-          DVLOG(1) << "ReadString: invalid escape";
+          QUICHE_DVLOG(1) << "ReadString: invalid escape";
           return absl::nullopt;
         }
         s.push_back(input_.front());
@@ -462,7 +462,7 @@
     }
     size_t len = input_.find(delimiter);
     if (len == absl::string_view::npos) {
-      DVLOG(1) << "ReadByteSequence: missing closing delimiter";
+      QUICHE_DVLOG(1) << "ReadByteSequence: missing closing delimiter";
       return absl::nullopt;
     }
     std::string base64(input_.substr(0, len));
@@ -471,7 +471,8 @@
 
     std::string binary;
     if (!absl::Base64Unescape(base64, &binary)) {
-      DVLOG(1) << "ReadByteSequence: failed to decode base64: " << base64;
+      QUICHE_DVLOG(1) << "ReadByteSequence: failed to decode base64: "
+                      << base64;
       return absl::nullopt;
     }
     input_.remove_prefix(len);
@@ -518,9 +519,10 @@
   }
 
   void LogParseError(const char* func, const char* expected) {
-    DVLOG(1) << func << ": " << expected << " expected, got "
-             << (input_.empty() ? "EOS"
-                                : "'" + std::string(input_.substr(0, 1)) + "'");
+    QUICHE_DVLOG(1) << func << ": " << expected << " expected, got "
+                    << (input_.empty()
+                            ? "EOS"
+                            : "'" + std::string(input_.substr(0, 1)) + "'");
   }
 
   absl::string_view input_;

quiche/spdy/core/metadata_extension.cc

diff --git a/quiche/spdy/core/metadata_extension.cc b/quiche/spdy/core/metadata_extension.cc
index 7ebc444..0993b99 100644
--- a/quiche/spdy/core/metadata_extension.cc
+++ b/quiche/spdy/core/metadata_extension.cc
@@ -101,7 +101,7 @@
         on_support_(true);
       }
     } else {
-      LOG_EVERY_N_SEC(WARNING, 1)
+      QUICHE_LOG_EVERY_N_SEC(WARNING, 1)
           << "Unrecognized value for setting " << id << ": " << value;
     }
   }