commit 86ddbbf4143daa721b84f0f253022d19d61b6fe3
author Paul Lawrence <paullawrence@google.com> Thu May 07 15:26:35 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 07 15:26:35 2015 +0000
tree 3b069ed1e2e479e48f66d129f29937f527c866bc
parent 42696d97ce138fa5e7a1380b3841250549acb615
parent 00f4aade5c172534c16070540d1c6c26d0a78c84

Merge "Delete password as per block encryption"

Android.mk

diff --git a/Android.mk b/Android.mk
index d4a178a..4052b7d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,7 +98,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CLANG := true
-LOCAL_SRC_FILES:= vdc.c
+LOCAL_SRC_FILES:= vdc.cpp
 LOCAL_MODULE:= vdc
 LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_CFLAGS := $(vold_cflags)

vdc.cpp

diff --git a/vdc.c b/vdc.cpp
similarity index 98%
rename from vdc.c
rename to vdc.cpp
index 6927e92..3e80940 100644
--- a/vdc.c
+++ b/vdc.cpp
@@ -100,7 +100,7 @@
 }
 
 static int do_monitor(int sock, int stop_after_cmd) {
-    char *buffer = malloc(4096);
+    char *buffer = (char *) malloc(4096);
 
     if (!stop_after_cmd)
         printf("[Connected to Vold]\n");