commit 31f0fc22357707b7c71f2ca08878b6ce6ddde1cb
author Doug Zongker <dougz@android.com> Tue Oct 13 11:59:45 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 11:59:45 2009 -0700
tree 85fbf84faee0d164617d2eab10e2f9c805271cf0
parent 2ec8a1929fea6fb2c0b1b0985dddb16d19d5e911
parent d93a25459cdefba940f254b4c5f54fd7d9cdaf11

am d93a2545: simplify construction of the recovery progress bar

Merge commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11'

* commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11':
  simplify construction of the recovery progress bar

recovery.c

diff --git a/recovery.c b/recovery.c
index 5b3f6e5..4385307 100644
--- a/recovery.c
+++ b/recovery.c
@@ -131,7 +131,6 @@
     if (strchr("wa", mode[0])) dirCreateHierarchy(path, 0777, NULL, 1);
 
     FILE *fp = fopen(path, mode);
-    if (fp == NULL) LOGE("Can't open %s\n", path);
     return fp;
 }
 
@@ -229,7 +228,9 @@
     // By this point, we're ready to return to the main system...
     if (send_intent != NULL) {
         FILE *fp = fopen_root_path(INTENT_FILE, "w");
-        if (fp != NULL) {
+        if (fp == NULL) {
+            LOGE("Can't open %s\n", INTENT_FILE);
+        } else {
             fputs(send_intent, fp);
             check_and_fclose(fp, INTENT_FILE);
         }
@@ -237,7 +238,9 @@
 
     // Copy logs to cache so the system can find out what happened.
     FILE *log = fopen_root_path(LOG_FILE, "a");
-    if (log != NULL) {
+    if (log == NULL) {
+        LOGE("Can't open %s\n", LOG_FILE);
+    } else {
         FILE *tmplog = fopen(TEMPORARY_LOG_FILE, "r");
         if (tmplog == NULL) {
             LOGE("Can't open %s\n", TEMPORARY_LOG_FILE);