Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make consitent internal file API flag behvior, FF_PROBE.

Browse source 
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
This commit is contained in:
Michael Sevakis 2017-01-18 04:51:56 -05:00
parent 6103d4d83d
commit 15e1f592de
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
firmware/common/file_internal.c
View file

@ -396,7 +396,8 @@ static int walk_open_info(struct pathwalk *walkp,
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 @@ int open_stream_internal(const char *path, unsigned int callflags,
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 @@ int test_stream_exists_internal(const char *path, unsigned int callflags)
{
/* 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 */