ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2715844

Change-Id: I120e30d5e8d9c77cef78375fde27686846cceb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-18 00:19:51 +00:00 • committed by Automerger Merge Worker
commit 5dd9d64608
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
init/first_stage_init.cpp
View file

@ -67,7 +67,7 @@ enum class BootMode {
void FreeRamdisk(DIR* dir, dev_t dev) { void FreeRamdisk(DIR* dir, dev_t dev) {
int dfd = dirfd(dir); int dfd = dirfd(dir);
dirent* de; dirent* de = nullptr;
while ((de = readdir(dir)) != nullptr) { while ((de = readdir(dir)) != nullptr) {
if (de->d_name == "."s || de->d_name == ".."s) { if (de->d_name == "."s || de->d_name == ".."s) {
continue; continue;
@ -76,7 +76,7 @@ void FreeRamdisk(DIR* dir, dev_t dev) {
bool is_dir = false; bool is_dir = false;
if (de->d_type == DT_DIR || de->d_type == DT_UNKNOWN) { if (de->d_type == DT_DIR || de->d_type == DT_UNKNOWN) {
struct stat info; struct stat info {};
if (fstatat(dfd, de->d_name, &info, AT_SYMLINK_NOFOLLOW) != 0) { if (fstatat(dfd, de->d_name, &info, AT_SYMLINK_NOFOLLOW) != 0) {
continue; continue;
} }
@ -171,7 +171,7 @@ std::string GetModuleLoadList(BootMode boot_mode, const std::string& dir_path) {
} }
if (module_load_file != "modules.load") { if (module_load_file != "modules.load") {
struct stat fileStat; struct stat fileStat {};
std::string load_path = dir_path + "/" + module_load_file; std::string load_path = dir_path + "/" + module_load_file;
// Fall back to modules.load if the other files aren't accessible // Fall back to modules.load if the other files aren't accessible
if (stat(load_path.c_str(), &fileStat)) { if (stat(load_path.c_str(), &fileStat)) {
@ -185,11 +185,11 @@ std::string GetModuleLoadList(BootMode boot_mode, const std::string& dir_path) {
#define MODULE_BASE_DIR "/lib/modules" #define MODULE_BASE_DIR "/lib/modules"
bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel, bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel,
int& modules_loaded) { int& modules_loaded) {
struct utsname uts; struct utsname uts {};
if (uname(&uts)) { if (uname(&uts)) {
LOG(FATAL) << "Failed to get kernel version."; LOG(FATAL) << "Failed to get kernel version.";
} }
int major, minor; int major = 0, minor = 0;
if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) {
LOG(FATAL) << "Failed to parse kernel version " << uts.release; LOG(FATAL) << "Failed to parse kernel version " << uts.release;
} }
@ -199,13 +199,13 @@ bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel
LOG(INFO) << "Unable to open /lib/modules, skipping module loading."; LOG(INFO) << "Unable to open /lib/modules, skipping module loading.";
return true; return true;
} }
dirent* entry; dirent* entry = nullptr;
std::vector<std::string> module_dirs; std::vector<std::string> module_dirs;
while ((entry = readdir(base_dir.get()))) { while ((entry = readdir(base_dir.get()))) {
if (entry->d_type != DT_DIR) { if (entry->d_type != DT_DIR) {
continue; continue;
} }
int dir_major, dir_minor; int dir_major = 0, dir_minor = 0;
if (sscanf(entry->d_name, "%d.%d", &dir_major, &dir_minor) != 2 || dir_major != major || if (sscanf(entry->d_name, "%d.%d", &dir_major, &dir_minor) != 2 || dir_major != major ||
dir_minor != minor) { dir_minor != minor) {
continue; continue;
@ -374,7 +374,7 @@ int FirstStageMain(int argc, char** argv) {
PLOG(ERROR) << "Could not opendir(\"/\"), not freeing ramdisk"; PLOG(ERROR) << "Could not opendir(\"/\"), not freeing ramdisk";
} }
struct stat old_root_info; struct stat old_root_info {};
if (stat("/", &old_root_info) != 0) { if (stat("/", &old_root_info) != 0) {
PLOG(ERROR) << "Could not stat(\"/\"), not freeing ramdisk"; PLOG(ERROR) << "Could not stat(\"/\"), not freeing ramdisk";
old_root_dir.reset(); old_root_dir.reset();
@ -483,7 +483,7 @@ int FirstStageMain(int argc, char** argv) {
} }
} }
struct stat new_root_info; struct stat new_root_info {};
if (stat("/", &new_root_info) != 0) { if (stat("/", &new_root_info) != 0) {
PLOG(ERROR) << "Could not stat(\"/\"), not freeing ramdisk"; PLOG(ERROR) << "Could not stat(\"/\"), not freeing ramdisk";
old_root_dir.reset(); old_root_dir.reset();