Skip to content

Commit 18c0423

Browse files
committed
minor cleanup
1 parent 07b2f9b commit 18c0423

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

proto_processing_lib/proto_scrubber/cloud_audit_log_field_checker.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class CloudAuditLogFieldChecker
5050
// and "c", and the message "a" can include only field "b".
5151
absl::Status AddOrIntersectFieldPaths(
5252
const std::vector<std::string>& paths) override;
53+
54+
using CloudAuditLogFieldCheckerInterface::CheckField;
5355
// Decides whether the given field path is included, partially included, or
5456
// excluded.
5557
//

proto_processing_lib/proto_scrubber/proto_scrubber.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@ absl::StatusOr<uint32_t> ProtoScrubber::ScanMapEntry(
727727
int current_position = start_position;
728728
bool is_key_found = false;
729729
bool is_value_added = false;
730-
bool is_value_null = true;
731730
FieldFilters excluded_by_filter = FieldFilters::Unspecified;
732731
uint32_t tag = input_stream->ReadTag();
733732
while (tag != 0) {
@@ -761,7 +760,6 @@ absl::StatusOr<uint32_t> ProtoScrubber::ScanMapEntry(
761760
}
762761
}
763762
} else if (field_number == 2) {
764-
is_value_null = false;
765763
if (check_result == FieldCheckResults::kExclude) {
766764
IncreaseFieldDroppedCount(map_type.name(), field_number,
767765
scrubber_context_, excluded_by_filter);

proto_processing_lib/proto_scrubber/proto_scrubber.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class ProtoScrubber : public ProtoScrubberInterface {
8484
virtual absl::StatusOr<uint32_t> ScrubWithChecksum(
8585
google::protobuf::field_extraction::MessageData* message) const override;
8686

87+
using ProtoScrubberInterface::CheckField;
8788
// Checks if a field should be kept by calling field_checkers_ and returns the
8889
// aggregated result. If one of them returns EXCLUDE, the aggregated result is
8990
// EXCLUDE. If all of them return INCLUDE, the aggregated result is INCLUDE.

0 commit comments

Comments
 (0)