diff options
author | Tao Bao <tbao@google.com> | 2015-08-21 20:24:12 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 20:24:12 +0200 |
commit | f0355aebe8bc833a6d287e11bf8cc9a56c43d32d (patch) | |
tree | 77158f2bcd0f4f814667390954cde6c160417110 /edify/parser.y | |
parent | am 4854e292: am ad509fd4: Merge "Fix potential crash" (diff) | |
parent | am 93fa4b67: Merge "edify: Switch to C++." (diff) | |
download | android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar.gz android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar.bz2 android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar.lz android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar.xz android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.tar.zst android_bootable_recovery-f0355aebe8bc833a6d287e11bf8cc9a56c43d32d.zip |
Diffstat (limited to 'edify/parser.y')
-rw-r--r-- | edify/parser.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/edify/parser.y b/edify/parser.y index f8fb2d12f..098a6370a 100644 --- a/edify/parser.y +++ b/edify/parser.y @@ -70,7 +70,7 @@ input: expr { *root = $1; } ; expr: STRING { - $$ = malloc(sizeof(Expr)); + $$ = reinterpret_cast<Expr*>(malloc(sizeof(Expr))); $$->fn = Literal; $$->name = $1; $$->argc = 0; @@ -91,7 +91,7 @@ expr: STRING { | IF expr THEN expr ENDIF { $$ = Build(IfElseFn, @$, 2, $2, $4); } | IF expr THEN expr ELSE expr ENDIF { $$ = Build(IfElseFn, @$, 3, $2, $4, $6); } | STRING '(' arglist ')' { - $$ = malloc(sizeof(Expr)); + $$ = reinterpret_cast<Expr*>(malloc(sizeof(Expr))); $$->fn = FindFunction($1); if ($$->fn == NULL) { char buffer[256]; @@ -113,12 +113,12 @@ arglist: /* empty */ { } | expr { $$.argc = 1; - $$.argv = malloc(sizeof(Expr*)); + $$.argv = reinterpret_cast<Expr**>(malloc(sizeof(Expr*))); $$.argv[0] = $1; } | arglist ',' expr { $$.argc = $1.argc + 1; - $$.argv = realloc($$.argv, $$.argc * sizeof(Expr*)); + $$.argv = reinterpret_cast<Expr**>(realloc($$.argv, $$.argc * sizeof(Expr*))); $$.argv[$$.argc-1] = $3; } ; |