linter fixes

Author: pes10k

etld/matcher.cc

@@ -9,7 +9,6 @@
 #include "etld/parser.h"
 #include "etld/public_suffix_rule.h"
 #include "etld/matcher.h"
-#include "etld/types.h"
 #include "etld/serialization.h"
 
 namespace brave_etld {
@@ -53,8 +52,7 @@ SerializationResult Matcher::Serialize() const {
     buffer_size,
     "%s:%s",
     header_str.c_str(),
-    buffer_body.c_str()
-  );
+    buffer_body.c_str());
 
   SerializationResult info;
   info.body_start = body_start;

etld/matcher.h

@@ -25,7 +25,8 @@ class Matcher {
   explicit Matcher(std::ifstream &rule_file);
   explicit Matcher(const std::string &rule_text);
   explicit Matcher(const PublicSuffixParseResult &rules);
-  Matcher(const PublicSuffixRuleSet &rules, const PublicSuffixRuleSet &exception_rules);
+  Matcher(const PublicSuffixRuleSet &rules,
+    const PublicSuffixRuleSet &exception_rules);
 
   SerializationResult Serialize() const;
 

etld/parser.cc

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include <memory>
 #include <string>
 #include <sstream>
 #include <fstream>
@@ -12,8 +11,6 @@
 #include "etld/public_suffix_rule.h"
 #include "etld/types.h"
 
-using std::unique_ptr;
-
 namespace brave_etld {
 
 PublicSuffixParseResult::PublicSuffixParseResult() {}

etld/public_suffix_rule.cc

@@ -13,8 +13,6 @@
 #include "etld/types.h"
 #include "etld/serialization.h"
 
-using std::unique_ptr;
-
 namespace brave_etld {
 
 std::vector<Label> parse_labels(const std::string &label_text) {
@@ -125,8 +123,7 @@ SerializationResult PublicSuffixRule::Serialize() const {
     header_str.c_str(),
     is_exception_ ? 't' : 'f',
     is_wildcard_ ? 't' : 'f',
-    domain_string.c_str()
-  );
+    domain_string.c_str());
 
   info.body_start = body_start;
   info.body_len = body_len;

etld/public_suffix_rule.h

@@ -12,8 +12,6 @@
 #include "etld/types.h"
 #include "etld/serialization.h"
 
-using std::unique_ptr;
-
 namespace brave_etld {
 
 class PublicSuffixRuleInputException : public std::exception {

etld/public_suffix_rule_set.cc

@@ -6,16 +6,13 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include <memory>
 #include <iostream>
 #include "etld/public_suffix_rule.h"
 #include "etld/public_suffix_rule_set.h"
 #include "etld/domain.h"
 #include "etld/types.h"
 #include "etld/serialization.h"
 
-using std::unique_ptr;
-
 namespace brave_etld {
 
 PublicSuffixRuleSet::PublicSuffixRuleSet() {}
@@ -70,8 +67,7 @@ SerializationResult PublicSuffixRuleSet::Serialize() const {
     buffer_size,
     "%s:%s",
     header_str.c_str(),
-    buffer_body.c_str()
-  );
+    buffer_body.c_str());
 
   SerializationResult info;
   info.body_start = body_start;

etld/public_suffix_rule_set.h

@@ -8,14 +8,11 @@
 
 #include <string>
 #include <vector>
-#include <memory>
 #include "etld/public_suffix_rule.h"
 #include "etld/domain.h"
 #include "etld/types.h"
 #include "etld/serialization.h"
 
-using std::unique_ptr;
-
 namespace brave_etld {
 
 struct PublicSuffixRuleSetMatchResult {

protocol.cc

@@ -42,7 +42,7 @@ bool isBlockableProtocol(const char *url, int urlLen) {
 
   const char *curChar = url;
   int totalCharsRead = 0;
-  int numCharsReadInState;
+  int numCharsReadInState = 0;
   char lowerChar;
   ProtocolParseState parseState = ProtocolParseStateStart;
 

test/etld_serialization_test.cc

@@ -73,46 +73,6 @@ TEST(eTLDSerializationMatcher, basic) {
   CHECK(testSerializeMatcher("!one.com\n*.two.com\nthree.com"));
 }
 
-bool testDeserializationCorrectness(const SerializedBuffer &rule_text,
-    int num_rules, int num_exception_rules) {
-  Matcher matcher = matcher_from_serialization(rule_text);
-  int num_matcher_rules = static_cast<int>(matcher.NumRules());
-  if (num_matcher_rules != num_rules) {
-    std::cout << "Expected " << num_rules << " rules from buffer, but received "
-              << num_matcher_rules << " rules." << std::endl;
-    return false;
-  }
-
-  int num_matcher_except_rules = static_cast<int>(matcher.NumExceptionRules());
-  if (num_matcher_except_rules != num_exception_rules) {
-    std::cout << "Expected " << num_rules << " exception rules from buffer, "
-              << "but received " <<  num_exception_rules << " rules."
-              << std::endl;
-    return false;
-  }
-
-  return true;
-}
-
-// TEST(eTLDDeserializationTests, basic) {
-//   CHECK(testDeserializationCorrectness(
-//     "47:42:29:ff||not-matching-anything.com8:fftrees^0:", 2, 0));
-// }
-
-bool testSerializationCorrectness(const string &rule_text,
-    const SerializedBuffer &serialized) {
-  Matcher matcher(rule_text);
-  SerializationResult result = matcher.Serialize();
-  return result.buffer.compare(serialized) == 0;
-}
-
-// TEST(eTLDSerializationTests, basic) {
-//   const string rules = "||s3.amazonaws.com^$third-party\n"
-//                        "||not-matching-anything.com\n"
-//                        "trees^";
-//   CHECK(testSerializationCorrectness(rules, ));
-// }
-
 bool testMatcherSerializationTransitivity(const string &public_suffix_rules) {
   Matcher orig(public_suffix_rules);
   SerializationResult res = orig.Serialize();
@@ -135,7 +95,7 @@ bool testAdBlockClientSerializationTransitivity(const string &filter_rules,
   AdBlockClient client;
   client.parse(filter_rules.c_str());
   client.parsePublicSuffixRules(public_suffix_rules.c_str());
-  
+
   int size;
   char* buffer = client.serialize(&size);
 
@@ -167,4 +127,4 @@ TEST(eTLDSerializationTransitivity, basic) {
   CHECK(testMatcherSerializationTransitivity(public_suffix_rules));
   CHECK(testAdBlockClientSerializationTransitivity(
     filer_rules, public_suffix_rules));
-}
+}

test/etld_test.cc

@@ -543,4 +543,4 @@ TEST(eTLDPublicSuffixRuleApplyFileTests, basic) {
       elm.input,
       elm.expected));
   }
-}
+}