Github/littlefs
1
Fork 0
Code Actions Activity

Changed lfsr_mtree_pathlookup to match other mtree functions

Browse Source
This commit is contained in:
Christopher Haster
2023-11-09 00:19:07 -06:00
parent 135bb17409
commit 0c3fea4a6e
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+13 -11
View File
@@ -6352,7 +6352,6 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
// lookup names in an mdir // lookup names in an mdir
// //
// if not found, rid will be the best place to insert // if not found, rid will be the best place to insert
//
static int lfsr_mdir_namelookup(lfs_t *lfs, const lfsr_mdir_t *mdir, static int lfsr_mdir_namelookup(lfs_t *lfs, const lfsr_mdir_t *mdir,
lfsr_did_t did, const char *name, lfs_size_t name_size, lfsr_did_t did, const char *name, lfs_size_t name_size,
lfsr_srid_t *rid_, lfsr_tag_t *tag_, lfsr_data_t *data_) { lfsr_srid_t *rid_, lfsr_tag_t *tag_, lfsr_data_t *data_) {
@@ -6384,7 +6383,9 @@ static int lfsr_mdir_namelookup(lfs_t *lfs, const lfsr_mdir_t *mdir,
return (lfs_cmp(cmp) == 0) ? 0 : LFS_ERR_NOENT; return (lfs_cmp(cmp) == 0) ? 0 : LFS_ERR_NOENT;
} }
// note if we fail, we at least leave mdir_/rid_ with the best place to insert // lookup names in our mtree
//
// if not found, rid will be the best place to insert
static int lfsr_mtree_namelookup(lfs_t *lfs, const lfsr_mtree_t *mtree, static int lfsr_mtree_namelookup(lfs_t *lfs, const lfsr_mtree_t *mtree,
lfsr_did_t did, const char *name, lfs_size_t name_size, lfsr_did_t did, const char *name, lfs_size_t name_size,
lfsr_mdir_t *mdir_, lfsr_tag_t *tag_, lfsr_data_t *data_) { lfsr_mdir_t *mdir_, lfsr_tag_t *tag_, lfsr_data_t *data_) {
@@ -6464,7 +6465,8 @@ enum {
// //
// if not found, mdir_/did_/name_ will at least be set up // if not found, mdir_/did_/name_ will at least be set up
// with what should be the parent // with what should be the parent
static int lfsr_mtree_pathlookup(lfs_t *lfs, const char *path, static int lfsr_mtree_pathlookup(lfs_t *lfs, const lfsr_mtree_t *mtree,
const char *path,
// TODO originally path itself was a double pointer, is that a // TODO originally path itself was a double pointer, is that a
// better design? // better design?
lfsr_mdir_t *mdir_, lfsr_tag_t *tag_, lfsr_mdir_t *mdir_, lfsr_tag_t *tag_,
@@ -6552,7 +6554,7 @@ static int lfsr_mtree_pathlookup(lfs_t *lfs, const char *path,
} }
// lookup up this name in the mtree // lookup up this name in the mtree
int err = lfsr_mtree_namelookup(lfs, &lfs->mtree, did, name, name_size, int err = lfsr_mtree_namelookup(lfs, mtree, did, name, name_size,
&mdir, &tag, NULL); &mdir, &tag, NULL);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
@@ -7992,7 +7994,7 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) {
lfsr_did_t did; lfsr_did_t did;
const char *name; const char *name;
lfs_size_t name_size; lfs_size_t name_size;
err = lfsr_mtree_pathlookup(lfs, path, err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, path,
&mdir, NULL, &mdir, NULL,
&did, &name, &name_size); &did, &name, &name_size);
if (err && (err != LFS_ERR_NOENT || lfsr_mdir_isroot(&mdir))) { if (err && (err != LFS_ERR_NOENT || lfsr_mdir_isroot(&mdir))) {
@@ -8117,7 +8119,7 @@ int lfsr_remove(lfs_t *lfs, const char *path) {
// lookup our entry // lookup our entry
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_tag_t tag; lfsr_tag_t tag;
err = lfsr_mtree_pathlookup(lfs, path, err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, path,
&mdir, &tag, &mdir, &tag,
NULL, NULL, NULL); NULL, NULL, NULL);
if (err) { if (err) {
@@ -8205,7 +8207,7 @@ int lfsr_rename(lfs_t *lfs, const char *old_path, const char *new_path) {
// lookup old entry // lookup old entry
lfsr_mdir_t old_mdir; lfsr_mdir_t old_mdir;
lfsr_tag_t old_tag; lfsr_tag_t old_tag;
err = lfsr_mtree_pathlookup(lfs, old_path, err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, old_path,
&old_mdir, &old_tag, &old_mdir, &old_tag,
NULL, NULL, NULL); NULL, NULL, NULL);
if (err) { if (err) {
@@ -8222,7 +8224,7 @@ int lfsr_rename(lfs_t *lfs, const char *old_path, const char *new_path) {
lfsr_did_t new_did; lfsr_did_t new_did;
const char *new_name; const char *new_name;
lfs_size_t new_name_size; lfs_size_t new_name_size;
err = lfsr_mtree_pathlookup(lfs, new_path, err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, new_path,
&new_mdir, &new_tag, &new_mdir, &new_tag,
&new_did, &new_name, &new_name_size); &new_did, &new_name, &new_name_size);
if (err && (err != LFS_ERR_NOENT || lfsr_mdir_isroot(&new_mdir))) { if (err && (err != LFS_ERR_NOENT || lfsr_mdir_isroot(&new_mdir))) {
@@ -8422,7 +8424,7 @@ int lfsr_stat(lfs_t *lfs, const char *path, struct lfs_info *info) {
lfsr_tag_t tag; lfsr_tag_t tag;
const char *name; const char *name;
lfs_size_t name_size; lfs_size_t name_size;
int err = lfsr_mtree_pathlookup(lfs, path, int err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, path,
&mdir, &tag, &mdir, &tag,
NULL, &name, &name_size); NULL, &name, &name_size);
if (err && err != LFS_ERR_INVAL) { if (err && err != LFS_ERR_INVAL) {
@@ -8444,7 +8446,7 @@ int lfsr_dir_open(lfs_t *lfs, lfsr_dir_t *dir, const char *path) {
// lookup our directory // lookup our directory
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_tag_t tag; lfsr_tag_t tag;
int err = lfsr_mtree_pathlookup(lfs, path, int err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, path,
&mdir, &tag, &mdir, &tag,
NULL, NULL, NULL); NULL, NULL, NULL);
if (err && err != LFS_ERR_INVAL) { if (err && err != LFS_ERR_INVAL) {
@@ -8734,7 +8736,7 @@ int lfsr_file_opencfg(lfs_t *lfs, lfsr_file_t *file,
lfsr_did_t did; lfsr_did_t did;
const char *name; const char *name;
lfs_size_t name_size; lfs_size_t name_size;
int err = lfsr_mtree_pathlookup(lfs, path, int err = lfsr_mtree_pathlookup(lfs, &lfs->mtree, path,
&file->m.mdir, &tag, &file->m.mdir, &tag,
&did, &name, &name_size); &did, &name, &name_size);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {