diff options
author | Doug Zongker | 2013-07-09 14:29:45 -0500 |
---|---|---|
committer | Doug Zongker | 2013-07-09 14:50:24 -0500 |
commit | fafc85b4ad7a5679c6b562bed64460732e05fd1e (patch) | |
tree | 830eb6f87a91e587eac04fa306206d70260ff6c2 /edify | |
parent | 602c4ebd393845f3388aea6ecb0c620580a7f332 (diff) | |
download | platform-bootable-recovery-fafc85b4ad7a5679c6b562bed64460732e05fd1e.tar.gz platform-bootable-recovery-fafc85b4ad7a5679c6b562bed64460732e05fd1e.tar.xz platform-bootable-recovery-fafc85b4ad7a5679c6b562bed64460732e05fd1e.zip |
recovery: move log output to stdout
Recovery currently has a random mix of messages printed to stdout and
messages printed to stderr, which can make logs hard to read. Move
everything to stdout.
Change-Id: Ie33bd4a9e1272e731302569cdec918e0534c48a6
Diffstat (limited to 'edify')
-rw-r--r-- | edify/expr.c | 4 | ||||
-rw-r--r-- | edify/main.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/edify/expr.c b/edify/expr.c index 07a8ceb6..a2f1f99d 100644 --- a/edify/expr.c +++ b/edify/expr.c | |||
@@ -287,13 +287,13 @@ Value* LessThanIntFn(const char* name, State* state, int argc, Expr* argv[]) { | |||
287 | 287 | ||
288 | long l_int = strtol(left, &end, 10); | 288 | long l_int = strtol(left, &end, 10); |
289 | if (left[0] == '\0' || *end != '\0') { | 289 | if (left[0] == '\0' || *end != '\0') { |
290 | fprintf(stderr, "[%s] is not an int\n", left); | 290 | printf("[%s] is not an int\n", left); |
291 | goto done; | 291 | goto done; |
292 | } | 292 | } |
293 | 293 | ||
294 | long r_int = strtol(right, &end, 10); | 294 | long r_int = strtol(right, &end, 10); |
295 | if (right[0] == '\0' || *end != '\0') { | 295 | if (right[0] == '\0' || *end != '\0') { |
296 | fprintf(stderr, "[%s] is not an int\n", right); | 296 | printf("[%s] is not an int\n", right); |
297 | goto done; | 297 | goto done; |
298 | } | 298 | } |
299 | 299 | ||
diff --git a/edify/main.c b/edify/main.c index 85570438..9e6bab7c 100644 --- a/edify/main.c +++ b/edify/main.c | |||
@@ -34,8 +34,8 @@ int expect(const char* expr_str, const char* expected, int* errors) { | |||
34 | int error_count = 0; | 34 | int error_count = 0; |
35 | error = yyparse(&e, &error_count); | 35 | error = yyparse(&e, &error_count); |
36 | if (error > 0 || error_count > 0) { | 36 | if (error > 0 || error_count > 0) { |
37 | fprintf(stderr, "error parsing \"%s\" (%d errors)\n", | 37 | printf("error parsing \"%s\" (%d errors)\n", |
38 | expr_str, error_count); | 38 | expr_str, error_count); |
39 | ++*errors; | 39 | ++*errors; |
40 | return 0; | 40 | return 0; |
41 | } | 41 | } |
@@ -49,7 +49,7 @@ int expect(const char* expr_str, const char* expected, int* errors) { | |||
49 | free(state.errmsg); | 49 | free(state.errmsg); |
50 | free(state.script); | 50 | free(state.script); |
51 | if (result == NULL && expected != NULL) { | 51 | if (result == NULL && expected != NULL) { |
52 | fprintf(stderr, "error evaluating \"%s\"\n", expr_str); | 52 | printf("error evaluating \"%s\"\n", expr_str); |
53 | ++*errors; | 53 | ++*errors; |
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
@@ -59,8 +59,8 @@ int expect(const char* expr_str, const char* expected, int* errors) { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | if (strcmp(result, expected) != 0) { | 61 | if (strcmp(result, expected) != 0) { |
62 | fprintf(stderr, "evaluating \"%s\": expected \"%s\", got \"%s\"\n", | 62 | printf("evaluating \"%s\": expected \"%s\", got \"%s\"\n", |
63 | expr_str, expected, result); | 63 | expr_str, expected, result); |
64 | ++*errors; | 64 | ++*errors; |
65 | free(result); | 65 | free(result); |
66 | return 0; | 66 | return 0; |