summaryrefslogtreecommitdiffstats
path: root/edify/expr.h
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-11-02 01:03:36 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-02 01:03:36 +0100
commit0b6085a341bbaf19efe2aba08ab0e221571cd5d4 (patch)
tree350aa2b452087380bba662d57964c160384750b2 /edify/expr.h
parentMerge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef (diff)
parentMerge "Cleanup ReadArgs & ReadValueArgs usage" (diff)
downloadandroid_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar.gz
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar.bz2
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar.lz
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar.xz
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.tar.zst
android_bootable_recovery-0b6085a341bbaf19efe2aba08ab0e221571cd5d4.zip
Diffstat (limited to 'edify/expr.h')
-rw-r--r--edify/expr.h25
1 files changed, 1 insertions, 24 deletions
diff --git a/edify/expr.h b/edify/expr.h
index 85306542d..911adbc82 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -128,30 +128,7 @@ bool ReadArgs(State* state, int argc, Expr* argv[], std::vector<std::string>* ar
// Evaluate the expressions in argv, and put the results of Value* in
// args. If any expression evaluate to nullptr, free the rest and return
// false. Return true on success.
-bool ReadValueArgs(State* state, int argc, Expr* argv[],
- std::vector<std::unique_ptr<Value>>* args);
-
-// Evaluate the expressions in argv, giving 'count' char* (the ... is
-// zero or more char** to put them in). If any expression evaluates
-// to NULL, free the rest and return -1. Return 0 on success.
-int ReadArgs(State* state, Expr* argv[], int count, ...);
-
-// Evaluate the expressions in argv, giving 'count' Value* (the ... is
-// zero or more Value** to put them in). If any expression evaluates
-// to NULL, free the rest and return -1. Return 0 on success.
-int ReadValueArgs(State* state, Expr* argv[], int count, ...);
-
-// Evaluate the expressions in argv, returning an array of char*
-// results. If any evaluate to NULL, free the rest and return NULL.
-// The caller is responsible for freeing the returned array and the
-// strings it contains.
-char** ReadVarArgs(State* state, int argc, Expr* argv[]);
-
-// Evaluate the expressions in argv, returning an array of Value*
-// results. If any evaluate to NULL, free the rest and return NULL.
-// The caller is responsible for freeing the returned array and the
-// Values it contains.
-Value** ReadValueVarArgs(State* state, int argc, Expr* argv[]);
+bool ReadValueArgs(State* state, int argc, Expr* argv[], std::vector<std::unique_ptr<Value>>* args);
// Use printf-style arguments to compose an error message to put into
// *state. Returns NULL.