commit 95440ebd97ef6a0d24920803af62dd3eefa0f7b7
author Jeff Sharkey <jsharkey@android.com> Mon Sep 18 18:19:28 2017 -0600
committer Jeff Sharkey <jsharkey@android.com> Wed Sep 20 13:29:48 2017 -0600
tree 025ac2dd8e2331263a0abfc1a1dacbeb8f1f9fdd
parent 49672b9351eb7e7f2bc655320aabd2fb6bd4c9d7

Enable "cert-err34-c" tidy checks.

Now that we've moved to Binder, we only have a few lingering atoi()
usages that are cleaned up in this CL.

Rewrite match_multi_entry() entirely, with tests to verify both old
and new implementations.

Test: adb shell /data/nativetest/vold_tests/vold_tests
Bug: 36655947
Change-Id: Ib79dc1ddc2366db4d5b4e1a1e2ed9456a06a983e

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index dc2e42a..3ac6428 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -304,7 +304,7 @@
             LOG(DEBUG) << "Skipping non-de-key " << entry->d_name;
             continue;
         }
-        userid_t user_id = atoi(entry->d_name);
+        userid_t user_id = std::stoi(entry->d_name);
         if (s_de_key_raw_refs.count(user_id) == 0) {
             auto key_path = de_dir + "/" + entry->d_name;
             KeyBuffer key;