commit aced5d9e4e438ba478ce54f9217166b8ab7cc24f
author Tianjie Xu <xunchang@google.com> Wed Oct 12 10:55:04 2016 -0700
committer Tianjie Xu <xunchang@google.com> Sat Oct 15 01:18:23 2016 +0000
tree b3bfca3430c25b7c35501497e0b8a0faf2251538
parent c5b4b719134a1d2d3b06a81f92a00b24e527248d

Change StringValue to use std::string

Changing the field of 'Value' in edify to std::string from char*.
Meanwhile cleaning up the users of 'Value' and switching them to
cpp style.

Test: compontent tests passed.
Bug: 31713288

Change-Id: Iec5a7d601b1e4ca40935bf1c70d325dafecec235

updater/updater.cpp

diff --git a/updater/updater.cpp b/updater/updater.cpp
index c752ebb..47696b8 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -151,13 +151,14 @@
         }
     }
 
-    char* result = Evaluate(&state, root);
+    std::string result;
+    bool status = Evaluate(&state, root, &result);
 
     if (have_eio_error) {
         fprintf(cmd_pipe, "retry_update\n");
     }
 
-    if (result == NULL) {
+    if (!status) {
         if (state.errmsg.empty()) {
             printf("script aborted (no error message)\n");
             fprintf(cmd_pipe, "ui_print script aborted (no error message)\n");
@@ -188,8 +189,7 @@
 
         return 7;
     } else {
-        fprintf(cmd_pipe, "ui_print script succeeded: result was [%s]\n", result);
-        free(result);
+        fprintf(cmd_pipe, "ui_print script succeeded: result was [%s]\n", result.c_str());
     }
 
     if (updater_info.package_zip) {