Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VFS: Modernize VDeviceList implementation

Browse Source
This commit is contained in:
Vicki Pfau 2024-01-21 02:21:41 -08:00
parent 12ed251c0b
commit 6e773eafea
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/util/vfs/vfs-devlist.c
View File

@ -20,7 +20,7 @@ static enum VFSType _vdleType(struct VDirEntry* vde);
struct VDirEntryDevList { struct VDirEntryDevList {
struct VDirEntry d; struct VDirEntry d;
size_t index; size_t index;
char* name; char name[PATH_MAX + 1];
}; };
struct VDirDevList { struct VDirDevList {
@ -31,7 +31,7 @@ struct VDirDevList {
struct VDir* VDeviceList() { struct VDir* VDeviceList() {
struct VDirDevList* vd = malloc(sizeof(struct VDirDevList)); struct VDirDevList* vd = malloc(sizeof(struct VDirDevList));
if (!vd) { if (!vd) {
return 0; return NULL;
} }
vd->d.close = _vdlClose; vd->d.close = _vdlClose;
@ -44,50 +44,42 @@ struct VDir* VDeviceList() {
vd->vde.d.name = _vdleName; vd->vde.d.name = _vdleName;
vd->vde.d.type = _vdleType; vd->vde.d.type = _vdleType;
vd->vde.index = 0; vd->vde.index = 0;
vd->vde.name = 0; vd->vde.name[0] = '\0';
return &vd->d; return &vd->d;
} }
static bool _vdlClose(struct VDir* vd) { static bool _vdlClose(struct VDir* vd) {
struct VDirDevList* vdl = (struct VDirDevList*) vd; struct VDirDevList* vdl = (struct VDirDevList*) vd;
free(vdl->vde.name);
free(vdl); free(vdl);
return true; return true;
} }
static void _vdlRewind(struct VDir* vd) { static void _vdlRewind(struct VDir* vd) {
struct VDirDevList* vdl = (struct VDirDevList*) vd; struct VDirDevList* vdl = (struct VDirDevList*) vd;
free(vdl->vde.name); vdl->vde.name[0] = '\0';
vdl->vde.name = 0; vdl->vde.index = 0;
vdl->vde.index = 3;
} }
static struct VDirEntry* _vdlListNext(struct VDir* vd) { static struct VDirEntry* _vdlListNext(struct VDir* vd) {
struct VDirDevList* vdl = (struct VDirDevList*) vd; struct VDirDevList* vdl = (struct VDirDevList*) vd;
if (vdl->vde.name) {
++vdl->vde.index;
free(vdl->vde.name);
vdl->vde.name = 0;
}
while (vdl->vde.index < STD_MAX) { while (vdl->vde.index < STD_MAX) {
const devoptab_t *devops = devoptab_list[vdl->vde.index]; const devoptab_t *devops = devoptab_list[vdl->vde.index];
if (devops->dirStateSize > 0) {
vdl->vde.name = malloc(strlen(devops->name) + 3);
sprintf(vdl->vde.name, "%s:", devops->name);
return &vdl->vde.d;
}
++vdl->vde.index; ++vdl->vde.index;
if (!devops || !devops->name || devops->dirStateSize <= 0) {
continue;
}
snprintf(vdl->vde.name, sizeof(vdl->vde.name), "%s:", devops->name);
return &vdl->vde.d;
} }
return 0; return NULL;
} }
static struct VFile* _vdlOpenFile(struct VDir* vd, const char* path, int mode) { static struct VFile* _vdlOpenFile(struct VDir* vd, const char* path, int mode) {
UNUSED(vd); UNUSED(vd);
UNUSED(path); UNUSED(path);
UNUSED(mode); UNUSED(mode);
return 0; return NULL;
} }
static struct VDir* _vdlOpenDir(struct VDir* vd, const char* path) { static struct VDir* _vdlOpenDir(struct VDir* vd, const char* path) {