aboutsummaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2012-07-15 15:30:43 -0700
committerKoushik Dutta <koushd@gmail.com>2012-07-15 15:30:43 -0700
commit214cc5d092ba8a4d17cc4e9ad4a351c408e2b393 (patch)
tree43ceb943b683dc9810ac336b795b76b35868bb72 /edify
parent05b41c988b704913045aa776ee64298400e72c83 (diff)
downloadbootable_recovery-214cc5d092ba8a4d17cc4e9ad4a351c408e2b393.zip
bootable_recovery-214cc5d092ba8a4d17cc4e9ad4a351c408e2b393.tar.gz
bootable_recovery-214cc5d092ba8a4d17cc4e9ad4a351c408e2b393.tar.bz2
forward port CWM to jellybean
Change-Id: Ibd66afe03c9a2c183e4c7db35fe34adf0f5e24ff
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