Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix clang-analyzer-core.uninitialized.Branch warnings"

Browse Source
This commit is contained in:
Treehugger Robot
2020-04-28 01:36:36 +00:00
committed by Gerrit Code Review
parent 1e590bf815 7887035743
commit 54ac3c6932
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bit/adb.cpp
View File

@@ -200,7 +200,7 @@ skip_bytes(int fd, ssize_t size, char* scratch, int scratchSize)
static int static int
skip_unknown_field(int fd, uint64_t tag, char* scratch, int scratchSize) { skip_unknown_field(int fd, uint64_t tag, char* scratch, int scratchSize) {
bool done; bool done = false;
int err; int err;
uint64_t size; uint64_t size;
switch (tag & 0x7) { switch (tag & 0x7) {

7
tools/incident_section_gen/main.cpp
View File

@@ -368,10 +368,13 @@ static bool generatePrivacyFlags(const Descriptor* descriptor, const Destination
// Don't generate a variable twice // Don't generate a variable twice
if (!hasDefaultFlags[i]) variableNames[fieldName] = false; if (!hasDefaultFlags[i]) variableNames[fieldName] = false;
} }
// hasDefaultFlags[i] has been initialized in the above for-loop,
// but clang-tidy analyzer still report uninitized values.
// So we use NOLINT to suppress those false positives.
bool allDefaults = true; bool allDefaults = true;
for (size_t i=0; i<fieldsInOrder.size(); i++) { for (size_t i=0; i<fieldsInOrder.size(); i++) {
allDefaults &= hasDefaultFlags[i]; allDefaults &= hasDefaultFlags[i]; // NOLINT(clang-analyzer-core.uninitialized.Assign)
} }
parents->erase(messageName); // erase the message type name when exit the message. parents->erase(messageName); // erase the message type name when exit the message.
@@ -384,7 +387,7 @@ static bool generatePrivacyFlags(const Descriptor* descriptor, const Destination
printf("Privacy* %s[] = {\n", messageName.c_str()); printf("Privacy* %s[] = {\n", messageName.c_str());
for (size_t i=0; i<fieldsInOrder.size(); i++) { for (size_t i=0; i<fieldsInOrder.size(); i++) {
const FieldDescriptor* field = fieldsInOrder[i]; const FieldDescriptor* field = fieldsInOrder[i];
if (hasDefaultFlags[i]) continue; if (hasDefaultFlags[i]) continue; // NOLINT(clang-analyzer-core.uninitialized.Branch)
printf(" &%s,\n", getFieldName(field).c_str()); printf(" &%s,\n", getFieldName(field).c_str());
policyCount++; policyCount++;
} }