Remove FF_CREAT and FF_EXCL flags in from file code.

These flags aren't stored for an open file because they're simply
actions for open() to take, corresponding to O_CREAT and O_EXCL.
Just pass the oflag argument along to the deeper call, with some
minor filtering.

Change-Id: Ic8bcfba718ebf4228bdc45de3088af1974820557

1 files changed, 7 insertions, 9 deletions

diff --git a/firmware/include/file_internal.h b/firmware/include/file_internal.h
index e7edb3a441..bb1236aed1 100644
--- a/firmware/include/file_internal.h
+++ b/firmware/include/file_internal.h
@@ -130,15 +130,13 @@ enum fildes_and_obj_flags
     FF_DIR         = 0x00010000, /* expect dir; accept dir only */
     FF_ANYTYPE     = 0x00020000, /* succeed if either file or dir */
     FF_TYPEMASK    = 0x00030000, /* mask of typeflags */
-    FF_CREAT       = 0x00040000, /* create if file doesn't exist */
-    FF_EXCL        = 0x00080000, /* fail if creating and file exists */
-    FF_CHECKPREFIX = 0x00100000, /* detect if file is prefix of path */
-    FF_NOISO       = 0x00200000, /* do not decode ISO filenames to UTF-8 */
-    FF_PROBE       = 0x00400000, /* only test existence; don't open */
-    FF_CACHEONLY   = 0x00800000, /* succeed only if in dircache */
-    FF_INFO        = 0x01000000, /* return info on self */
-    FF_PARENTINFO  = 0x02000000, /* return info on parent */
-    FF_MASK        = 0x03ff0000,
+    FF_CHECKPREFIX = 0x00040000, /* detect if file is prefix of path */
+    FF_NOISO       = 0x00080000, /* do not decode ISO filenames to UTF-8 */
+    FF_PROBE       = 0x00100000, /* only test existence; don't open */
+    FF_CACHEONLY   = 0x00200000, /* succeed only if in dircache */
+    FF_INFO        = 0x00400000, /* return info on self */
+    FF_PARENTINFO  = 0x00800000, /* return info on parent */
+    FF_MASK        = 0x00ff0000,
 };
 
 /** Common data structures used throughout **/