aboutsummaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2012-04-12 11:01:22 -0700
committerDoug Zongker <dougz@android.com>2012-04-12 11:01:22 -0700
commite5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c (patch)
treec88149f2f9c48966f66533e7bbf0b66ae407a314 /edify
parent48704798ea79a4cf0a4024ffcd18fc11ca03a43c (diff)
downloadbootable_recovery-e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c.zip
bootable_recovery-e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c.tar.gz
bootable_recovery-e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c.tar.bz2
minor recovery changes
- add the --just_exit option to make recovery exit normally without doing anything - make it possible to build updater extensions in C++ - add the clear_display command so that the updater binary can request recovery switch to the NONE background UI These are all used to support the notion of using OTA as a factory reflash mechanism. Change-Id: Ib00d1cbf540feff38f52a61a2cf198915b48488c
Diffstat (limited to 'edify')
-rw-r--r--edify/expr.c2
-rw-r--r--edify/expr.h10
2 files changed, 10 insertions, 2 deletions
diff --git a/edify/expr.c b/edify/expr.c
index 3600075..07a8ceb 100644
--- a/edify/expr.c
+++ b/edify/expr.c
@@ -495,7 +495,7 @@ Value** ReadValueVarArgs(State* state, int argc, Expr* argv[]) {
// Use printf-style arguments to compose an error message to put into
// *state. Returns NULL.
-Value* ErrorAbort(State* state, char* format, ...) {
+Value* ErrorAbort(State* state, const char* format, ...) {
char* buffer = malloc(4096);
va_list v;
va_start(v, format);
diff --git a/edify/expr.h b/edify/expr.h
index 8e1c638..0d8ed8f 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -21,6 +21,10 @@
#include "yydefs.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define MAX_STRING_LEN 1024
typedef struct Expr Expr;
@@ -152,7 +156,7 @@ Value** ReadValueVarArgs(State* state, int argc, Expr* argv[]);
// Use printf-style arguments to compose an error message to put into
// *state. Returns NULL.
-Value* ErrorAbort(State* state, char* format, ...);
+Value* ErrorAbort(State* state, const char* format, ...) __attribute__((format(printf, 2, 3)));
// Wrap a string into a Value, taking ownership of the string.
Value* StringValue(char* str);
@@ -160,4 +164,8 @@ Value* StringValue(char* str);
// Free a Value object.
void FreeValue(Value* v);
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif // _EXPRESSION_H