commit 022229c47e5bd918d26d11b3c12ae0dc0af58605
author Doug Zongker <dougz@android.com> Mon Oct 12 11:45:31 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 11:45:31 2009 -0700
tree 1067a17754f2cd367239553b6e22eebee21916fd
parent 4526d4fe6252d0c328c4e9ce8e1920f6d6ad1bbc
parent 988500b615de24455e1fee69e72055bb1dca9c86

am 988500b6: add terminator to recovery\'s getopt_long options array

Merge commit '988500b615de24455e1fee69e72055bb1dca9c86'

* commit '988500b615de24455e1fee69e72055bb1dca9c86':
  add terminator to recovery's getopt_long options array

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);