commit 26d1d7701cc2945c29f0d8a1ee6e33c4b5d70130
author Tianjie Xu <xunchang@google.com> Mon Mar 13 14:35:21 2017 -0700
committer Tianjie Xu <xunchang@google.com> Mon Mar 13 23:37:24 2017 +0000
tree 53ca6a64bfc7c36b7995f74728293c8a863bf3c0
parent c104cbab2ecda6b57bc9c9396bcd7ace7372d1b7

Modify the device specific recovery code to match the edify change.

Bug: 32117870
Test: mma
Change-Id: Ic4e8da48db952a6b36b8964ad2354c122799efd2

recovery/recovery_updater.cpp

diff --git a/recovery/recovery_updater.cpp b/recovery/recovery_updater.cpp
index fa23078..8133857 100644
--- a/recovery/recovery_updater.cpp
+++ b/recovery/recovery_updater.cpp
@@ -26,6 +26,7 @@
 #include <cutils/properties.h>
 #include <sys/mman.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -286,18 +287,19 @@
 	return ret;
 }
 
-Value* FlashIfwiFuguFn(const char *name, State * state, int argc, Expr * argv[]) {
+Value* FlashIfwiFuguFn(const char *name, State * state,
+                       const std::vector<std::unique_ptr<Expr>>& argv) {
 	Value *ret = NULL;
 	unsigned char *buffer = NULL;
 	int ifwi_size;
 	FILE *f = NULL;
 
-	if (argc != 1) {
-		ErrorAbort(state, "%s() expected 1 arg, got %d", name, argc);
+	if (argv.size() != 1) {
+		ErrorAbort(state, "%s() expected 1 arg, got %zu", name, argv.size());
 		return NULL;
 	}
 	std::vector<std::string> args;
-	if (!ReadArgs(state, 1, argv, &args)) {
+	if (!ReadArgs(state, argv, &args)) {
 		ErrorAbort(state, "%s() invalid args ", name);
 		return NULL;
 	}