Make consitent internal file API flag behvior, FF_PROBE.
FF_PROBE should leave nothing for caller to clean up whether
testing only the cache or permitting disk access. Less to worry
about.
Change-Id: Iea5aa3c1ae7f9025a9de528b127f08e490154048
diff --git a/firmware/common/file_internal.c b/firmware/common/file_internal.c
index aa0edb7..75fb21e 100644
--- a/firmware/common/file_internal.c
+++ b/firmware/common/file_internal.c
@@ -396,7 +396,8 @@
else
callflags &= ~FO_DIRECTORY;
- /* make open official if not simply probing for presence */
+ /* make open official if not simply probing for presence - must do it here
+ or compp->info on stack will get destroyed before it was copied */
if (!(callflags & FF_PROBE))
fileop_onopen_internal(stream, &compp->info, callflags);
@@ -649,6 +650,10 @@
IF_MV( rc = rootrc; )
case WALK_RC_NOT_FOUND:
case WALK_RC_FOUND:
+ /* FF_PROBE leaves nothing for caller to clean up */
+ if (callflags & FF_PROBE)
+ filestr_base_destroy(stream);
+
break;
default: /* utter, abject failure :`( */
@@ -776,12 +781,7 @@
{
/* only FF_* flags should be in callflags */
struct filestr_base stream;
- int rc = open_stream_internal(path, callflags | FF_PROBE, &stream, NULL);
-
- if (rc >= 0)
- filestr_base_destroy(&stream);
-
- return rc;
+ return open_stream_internal(path, callflags | FF_PROBE, &stream, NULL);
}
/* one-time init at startup */