Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DFS/FIXUP] Fixup ISO9660 build #9790

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions components/dfs/dfs_v1/filesystems/iso9660/dfs_iso9660.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <dfs.h>
#include <dfs_fs.h>
#include <dfs_file.h>
#include <posix/string.h>
#include <drivers/misc.h>
#include <drivers/byteorder.h>

Expand Down Expand Up @@ -118,7 +119,7 @@ rt_packed(struct iso9660_common_voldesc
struct iso9660_date created;
struct iso9660_date modified;
rt_uint8_t unused5[0 /* 1201 */];
};
});

struct iso9660
{
Expand Down Expand Up @@ -250,7 +251,7 @@ static struct iso9660_fd *iso9660_lookup(struct iso9660 *iso, const char *path,

/* Skip the first '/' */
++path;
len = rt_strchrnul(path, '/') - path;
len = strchrnul(path, '/') - path;
}

lba = rt_le32_to_cpu(dirent->first_sector);
Expand Down Expand Up @@ -359,7 +360,7 @@ static struct iso9660_fd *iso9660_lookup(struct iso9660 *iso, const char *path,
sz = 0;

path += len + 1;
len = rt_strchrnul(path, '/') - path;
len = strchrnul(path, '/') - path;
}
} while (len);

Expand Down Expand Up @@ -474,7 +475,7 @@ static int dfs_iso9660_read(struct dfs_file *fd, void *buf, size_t count)
return rcount;
}

static int dfs_iso9660_lseek(struct dfs_file *fd, off_t offset)
static off_t dfs_iso9660_lseek(struct dfs_file *fd, off_t offset)
{
int ret = -EIO;

Expand Down
Loading