*: Avoid memset where possible

Signed-off-by: Andrew Gunnerson <[email protected]>

Author: chenxiaolong

Diff for: libmbbootimg/src/format/loki.cpp

@@ -296,7 +296,7 @@ oc::result<void> _loki_patch_file(Writer &writer, File &file,
     uint64_t aboot_offset;
     LokiTarget *tgt = nullptr;
     android::AndroidHeader ahdr;
-    LokiHeader lhdr;
+    LokiHeader lhdr = {};
 
     memcpy(patch, LOKI_SHELLCODE, LOKI_SHELLCODE_SIZE);
 
@@ -354,8 +354,6 @@ oc::result<void> _loki_patch_file(Writer &writer, File &file,
     OUTCOME_TRYV(_loki_read_android_header(writer, file, ahdr));
 
     // Set up Loki header
-    memset(&lhdr, 0, sizeof(lhdr));
-
     memcpy(lhdr.magic, LOKI_MAGIC, LOKI_MAGIC_SIZE);
     lhdr.recovery = 0;
     strncpy(lhdr.build, tgt->build, sizeof(lhdr.build) - 1);

Diff for: libmbbootimg/tests/format/test_android_reader.cpp

@@ -231,7 +231,7 @@ TEST(AndroidSetHeaderTest, ValuesShouldMatch)
              "Test board name");
     snprintf(reinterpret_cast<char *>(ahdr.cmdline), sizeof(ahdr.cmdline),
              "Test cmdline");
-    memset(ahdr.id, 0xff, sizeof(ahdr.id));
+    std::fill(std::begin(ahdr.id), std::end(ahdr.id), 0xff);
 
     ASSERT_TRUE(AndroidFormatReader::convert_header(ahdr, header));
 

Diff for: libmbcommon/src/file/memory.cpp

@@ -212,8 +212,8 @@ oc::result<size_t> MemoryFile::on_write(const void *buf, size_t size)
             }
 
             // Zero-initialize new space
-            memset(static_cast<char *>(new_data) + m_size, 0,
-                   desired_size - m_size);
+            std::fill_n(static_cast<char *>(new_data) + m_size,
+                        desired_size - m_size, 0);
 
             m_data = new_data;
             m_size = desired_size;
@@ -272,8 +272,8 @@ oc::result<void> MemoryFile::on_truncate(uint64_t size)
 
         // Zero-initialize new space
         if (size > m_size) {
-            memset(static_cast<char *>(new_data) + m_size, 0,
-                   static_cast<size_t>(size) - m_size);
+            std::fill_n(static_cast<char *>(new_data) + m_size,
+                        static_cast<size_t>(size) - m_size, 0);
         }
 
         m_data = new_data;

Diff for: libmbcommon/tests/test_file_util.cpp

@@ -19,6 +19,7 @@
 
 #include <gmock/gmock.h>
 
+#include <algorithm>
 #include <memory>
 #include <vector>
 
@@ -456,8 +457,9 @@ TEST(FileMoveTest, LargeForwardsCopyShouldSucceed)
 {
     std::vector<unsigned char> buf(100000);
 
-    memset(buf.data(), 'a', buf.size() / 2);
-    memset(buf.data() + buf.size() / 2, 'b', buf.size() / 2);
+    auto middle = buf.begin() + buf.size() / 2;
+    std::fill(buf.begin(), middle, 'a');
+    std::fill(middle, buf.end(), 'b');
 
     MemoryFile file(buf.data(), buf.size());
     ASSERT_TRUE(file.is_open());
@@ -475,8 +477,9 @@ TEST(FileMoveTest, LargeBackwardsCopyShouldSucceed)
 {
     std::vector<unsigned char> buf(100000);
 
-    memset(buf.data(), 'a', buf.size() / 2);
-    memset(buf.data() + buf.size() / 2, 'b', buf.size() / 2);
+    auto middle = buf.begin() + buf.size() / 2;
+    std::fill(buf.begin(), middle, 'a');
+    std::fill(middle, buf.end(), 'b');
 
     MemoryFile file(buf.data(), buf.size());
     ASSERT_TRUE(file.is_open());

Diff for: libmbpatcher/src/patchers/odinpatcher.cpp

@@ -20,6 +20,7 @@
 #include "mbpatcher/patchers/odinpatcher.h"
 
 #include <algorithm>
+#include <array>
 #include <thread>
 #include <unordered_set>
 
@@ -372,16 +373,16 @@ bool OdinPatcher::process_file(archive *a, archive_entry *entry, bool sparse)
 
 static const char * indent(unsigned int depth)
 {
-    static char buf[16];
-    memset(buf, ' ', sizeof(buf));
+    static std::array<char, 16> buf;
+    buf.fill(' ');
 
-    if (depth * 2 < sizeof(buf) - 1) {
+    if (depth * 2 < buf.size() - 1) {
         buf[depth * 2] = '\0';
     } else {
-        buf[sizeof(buf) - 1] = '\0';
+        buf[buf.size() - 1] = '\0';
     }
 
-    return buf;
+    return buf.data();
 }
 
 struct NestedCtx

Diff for: libmbsign/src/mbsign.cpp

@@ -367,6 +367,7 @@ bool sign_data(BIO *bio_data_in, BIO *bio_sig_out, EVP_PKEY *pkey)
     unsigned char *buf = nullptr;
     size_t len;
     int n;
+    SigHeader hdr = {};
 
     if (version == VERSION_1_SHA512_DGST) {
         md_type = EVP_sha512();
@@ -438,8 +439,6 @@ bool sign_data(BIO *bio_data_in, BIO *bio_sig_out, EVP_PKEY *pkey)
     }
 
     // Write header
-    SigHeader hdr;
-    memset(&hdr, 0, sizeof(hdr));
     memcpy(hdr.magic, MAGIC, MAGIC_SIZE);
     hdr.version = version;
 

Diff for: libmbsparse/src/sparse.cpp

@@ -439,7 +439,7 @@ oc::result<size_t> SparseFile::on_read(void *buf, size_t size)
             break;
         }
         case CHUNK_TYPE_DONT_CARE:
-            memset(buf, 0, static_cast<size_t>(to_read));
+            std::fill_n(reinterpret_cast<unsigned char *>(buf), to_read, 0);
             n_read = to_read;
             break;
         default:

Diff for: libmbutil/src/archive.cpp

@@ -90,12 +90,10 @@ bool libarchive_copy_data_disk_to_archive(archive *in, archive *out,
     ssize_t bytes_written;
     int64_t offset;
     int64_t progress = 0;
-    char null_buf[64 * 1024];
+    char null_buf[64 * 1024] = {};
     const void *buf;
     int ret;
 
-    memset(null_buf, 0, sizeof(null_buf));
-
     while ((ret = archive_read_data_block(
             in, &buf, &bytes_read, &offset)) == ARCHIVE_OK) {
         if (offset > progress) {

Diff for: libmbutil/src/loopdev.cpp

@@ -99,7 +99,7 @@ static int find_loopdev_by_scanning(void)
     // Avoid /dev/block/loop0 since some installers (ahem, SuperSU) are
     // hardcoded to use it
     for (int n = 1; n < MAX_LOOPDEVS; ++n) {
-        struct loop_info64 loopinfo;
+        loop_info64 loopinfo;
         struct stat sb;
 
         sprintf(loopdev, LOOP_FMT, n);
@@ -168,7 +168,7 @@ bool loopdev_set_up_device(const std::string &loopdev, const std::string &file,
     int ffd = -1;
     int lfd = -1;
 
-    struct loop_info64 loopinfo;
+    loop_info64 loopinfo = {};
 
     if ((ffd = open(file.c_str(), ro ? O_RDONLY : O_RDWR)) < 0) {
         return false;
@@ -186,7 +186,6 @@ bool loopdev_set_up_device(const std::string &loopdev, const std::string &file,
         close(lfd);
     });
 
-    memset(&loopinfo, 0, sizeof(struct loop_info64));
     strlcpy(reinterpret_cast<char *>(loopinfo.lo_file_name), file.c_str(),
             LO_NAME_SIZE);
     loopinfo.lo_offset = offset;

Diff for: libmbutil/src/selinux.cpp

@@ -307,8 +307,7 @@ bool selinux_get_enforcing(int &value)
         return false;
     }
 
-    char buf[20];
-    memset(buf, 0, sizeof(buf));
+    char buf[20] = {};
     ssize_t ret = read(fd, buf, sizeof(buf) - 1);
     close(fd);
     if (ret < 0) {

Diff for: libmbutil/src/string.cpp

@@ -112,11 +112,10 @@ char ** dup_cstring_list(const char * const *list)
     for (items = 0; list[items]; ++items);
     size_t size = (items + 1) * sizeof(list[0]);
 
-    copy = static_cast<char **>(malloc(size));
+    copy = static_cast<char **>(calloc(1, size));
     if (!copy) {
         return nullptr;
     }
-    memset(copy, 0, size);
 
     for (size_t i = 0; i < items; ++i) {
         copy[i] = strdup(list[i]);

Diff for: mbbootui/daemon_connection.cpp

@@ -341,7 +341,7 @@ bool MbtoolConnection::connect()
     }
 
     int fd;
-    struct sockaddr_un addr;
+    sockaddr_un addr = {};
 
     fd = socket(AF_LOCAL, SOCK_STREAM, 0);
     if (fd < 0) {
@@ -356,15 +356,14 @@ bool MbtoolConnection::connect()
     char abs_name[] = "\0" SOCKET_ADDRESS;
     size_t abs_name_len = sizeof(abs_name) - 1;
 
-    memset(&addr, 0, sizeof(addr));
     addr.sun_family = AF_LOCAL;
     memcpy(addr.sun_path, abs_name, abs_name_len);
 
     // Calculate correct length so the trailing junk is not included in the
     // abstract socket name
-    socklen_t addr_len = offsetof(struct sockaddr_un, sun_path) + abs_name_len;
+    socklen_t addr_len = offsetof(sockaddr_un, sun_path) + abs_name_len;
 
-    if (::connect(fd, (struct sockaddr *) &addr, addr_len) < 0) {
+    if (::connect(fd, reinterpret_cast<sockaddr *>(&addr), addr_len) < 0) {
         LOGE("Failed to connect to socket: %s", strerror(errno));
         return false;
     }

Diff for: mbtool/appsync.cpp

@@ -257,16 +257,13 @@ static void put_socket_to_env(const char *name, int fd)
  */
 static int create_new_socket()
 {
-    struct sockaddr_un addr;
-    int fd;
-
-    fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+    int fd = socket(AF_LOCAL, SOCK_STREAM, 0);
     if (fd < 0) {
         LOGE("Failed to create socket: %s", strerror(errno));
         return -1;
     }
 
-    memset(&addr, 0, sizeof(addr));
+    sockaddr_un addr = {};
     addr.sun_family = AF_LOCAL;
     snprintf(addr.sun_path, sizeof(addr.sun_path), "%s",
              INSTALLD_SOCKET_PATH);
@@ -374,9 +371,7 @@ static bool send_message(int fd, const char *command,
  */
 static int connect_to_installd()
 {
-    struct sockaddr_un addr;
-
-    memset(&addr, 0, sizeof(addr));
+    sockaddr_un addr = {};
     addr.sun_family = AF_LOCAL;
     snprintf(addr.sun_path, sizeof(addr.sun_path), "%s",
              INSTALLD_SOCKET_PATH);
@@ -502,7 +497,8 @@ static bool do_remove(const std::vector<std::string> &args)
 #undef TAG
 }
 
-struct CommandInfo {
+struct CommandInfo
+{
     const char *name;
     unsigned int nargs;
     bool (*func)(const std::vector<std::string> &args);
@@ -753,9 +749,7 @@ static bool proxy_process(int fd, bool can_appsync)
 
         LOGD("---");
 
-        struct pollfd fds[2];
-        memset(fds, 0, sizeof(fds));
-
+        pollfd fds[2] = {};
         fds[0].fd = client_fd;
         fds[0].events = POLLIN;
         fds[1].fd = installd_fd;

Diff for: mbtool/daemon.cpp

@@ -190,10 +190,7 @@ static bool client_connection(int fd)
 
 static bool run_daemon()
 {
-    int fd;
-    struct sockaddr_un addr;
-
-    fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+    int fd = socket(AF_LOCAL, SOCK_STREAM, 0);
     if (fd < 0) {
         LOGE("Failed to create socket: %s", strerror(errno));
         return false;
@@ -206,7 +203,7 @@ static bool run_daemon()
     char abs_name[] = "\0mbtool.daemon";
     size_t abs_name_len = sizeof(abs_name) - 1;
 
-    memset(&addr, 0, sizeof(addr));
+    sockaddr_un addr = {};
     addr.sun_family = AF_LOCAL;
     memcpy(addr.sun_path, abs_name, abs_name_len);
 

Diff for: odinupdater/fuse-sparse.cpp

@@ -308,8 +308,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    fuse_operations fuse_oper;
-    memset(&fuse_oper, 0, sizeof(fuse_oper));
+    fuse_operations fuse_oper = {};
     fuse_oper.getattr = fuse_getattr;
     fuse_oper.open    = fuse_open;
     fuse_oper.read    = fuse_read;