summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authornkk71 <nkk71x@gmail.com>2017-03-06 21:06:31 +0100
committerDees Troy <dees_troy@teamw.in>2017-03-06 21:39:10 +0100
commit201d4b21bcb6749ba6d80596064527d9bc027638 (patch)
tree082840c8a25b0953401f2d8793d057e3f3ed89f1 /crypto
parentAdd TWRP app install to landscape and watch themes (diff)
downloadandroid_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar.gz
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar.bz2
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar.lz
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar.xz
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.tar.zst
android_bootable_recovery-201d4b21bcb6749ba6d80596064527d9bc027638.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/vold_decrypt/vold_decrypt.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/vold_decrypt/vold_decrypt.cpp b/crypto/vold_decrypt/vold_decrypt.cpp
index c9faf4733..d535a2514 100644
--- a/crypto/vold_decrypt/vold_decrypt.cpp
+++ b/crypto/vold_decrypt/vold_decrypt.cpp
@@ -215,11 +215,11 @@ void set_needed_props(void) {
}
string vdc_cryptfs_cmd(string log_name) {
- string cmd;
+ string cmd = "LD_LIBRARY_PATH=/system/lib64:/system/lib /system/bin/vdc cryptfs";
- cmd = "LD_LIBRARY_PATH=/system/lib64:/system/lib /system/bin/vdc cryptfs";
-
-#ifdef TW_CRYPTO_SYSTEM_VOLD_DEBUG
+#ifndef TW_CRYPTO_SYSTEM_VOLD_DEBUG
+ (void)log_name; // do nothing, but get rid of compiler warning in non debug builds
+#else
if (has_timeout && has_strace)
cmd = "/sbin/strace -q -tt -ff -v -y -s 1000 -o /tmp/strace_vdc_" + log_name + " /sbin/timeout -t 30 -s KILL env " + cmd;
else if (has_strace)
@@ -552,7 +552,6 @@ int vold_decrypt(string Password)
#ifdef TW_CRYPTO_SYSTEM_VOLD_DEBUG
if (pid_strace > 0) {
LOGDECRYPT_KMSG("Stopping strace_init (pid=%d)\n", pid_strace);
- int died = 0;
int timeout;
int status;
pid_t retpid = waitpid(pid_strace, &status, WNOHANG);