Fix errors being hidden by Protobuf warning-disabling
(This is a merge of http://go/wvgerrit/140850.) This patch fixes a number of minor issues in the codebase (mostly instances of 0-as-nullptr, but also some member shadowing and a missing override) that were being hidden by the fact that depending on Protobuf disables these diagnostics. And which will be unhidden when a later patch removes that behavior from Protobuf. Bug: 208304830 Test: x86-64 Change-Id: I4b0b1264748880b3726a6388d589868d898f949e
This commit is contained in:
committed by
John Bruce
parent
5606e7dae3
commit
df23c7da03
@@ -30,7 +30,7 @@ const int kTimeout = 3000;
|
||||
class HttpSocketTest : public testing::Test {
|
||||
public:
|
||||
HttpSocketTest() {}
|
||||
~HttpSocketTest() {}
|
||||
~HttpSocketTest() override {}
|
||||
|
||||
protected:
|
||||
bool Connect(const std::string& server_url) {
|
||||
@@ -164,7 +164,7 @@ ParseUrlTests parse_url_tests[] = {
|
||||
"8888", // port
|
||||
"/", // path
|
||||
},
|
||||
{nullptr, nullptr, false, nullptr, 0, nullptr} // list terminator
|
||||
{} // list terminator
|
||||
};
|
||||
|
||||
TEST_F(HttpSocketTest, ParseUrlTest) {
|
||||
|
||||
@@ -535,9 +535,12 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidationV15) {
|
||||
}
|
||||
|
||||
struct EntitledKeyVariant {
|
||||
EntitledKeyVariant(const char* name, const std::string& key,
|
||||
bool should_succeed)
|
||||
: name(name), key(key), should_succeed(should_succeed) {}
|
||||
EntitledKeyVariant(const char* name_param, const std::string& key_param,
|
||||
bool should_succeed_param)
|
||||
: name(name_param),
|
||||
key(key_param),
|
||||
should_succeed(should_succeed_param) {}
|
||||
|
||||
const std::string name;
|
||||
const std::string key;
|
||||
const bool should_succeed;
|
||||
|
||||
@@ -764,7 +764,7 @@ bool TestLicenseHolder::DeriveKey(const std::vector<uint8_t>& key,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, 0)) {
|
||||
if (!CMAC_Init(cmac_ctx, &key[0], key.size(), cipher, nullptr)) {
|
||||
LOGE("DeriveKey(): CMAC_Init");
|
||||
CMAC_CTX_free(cmac_ctx);
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user