Skip to content

Commit 60a63c1

Browse files
committed
overrides
1 parent 3d51335 commit 60a63c1

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

src/FileSystems/FileSystemMemory.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class FileSystemMemory : public FileSystem {
127127
/// adds a in memory file
128128
bool add(const char *name, const void *data, size_t len) {
129129
const char *name_internal = name+filenameOffset();
130-
FS_LOGD("add: name='%s' len=%d", name_internal, len);
130+
FS_LOGI("add: name='%s' len=%d", name_internal, len);
131131
if (&DefaultRegistry.fileSystem(name) != this) {
132132
FS_LOGE("File %s not vaid for %s in %s", name, this->pathPrefix(),
133133
DefaultRegistry.fileSystem(name).name());
@@ -157,7 +157,7 @@ class FileSystemMemory : public FileSystem {
157157

158158
/// file operations
159159
int open(const char *path, int flags, int mode) override {
160-
FS_LOGD("open: path='%s' ", path);
160+
FS_LOGI("open: path='%s' ", path);
161161
RegEntry &mem_entry = get(path);
162162
if (!mem_entry) {
163163
FS_LOGW("open: file '%s' does not exist", path);
@@ -182,7 +182,7 @@ class FileSystemMemory : public FileSystem {
182182
};
183183

184184
ssize_t read(int fd, void *data, size_t size) override {
185-
FS_LOGD("read: fd='%d' size=%d", fd, (int)size);
185+
FS_LOGI("read: fd='%d' size=%d", fd, (int)size);
186186
if (size == 0) {
187187
return 0;
188188
}
@@ -204,13 +204,13 @@ class FileSystemMemory : public FileSystem {
204204
}
205205

206206
int close(int fd) override {
207-
FS_LOGD("close: fd='%d' ", fd);
207+
FS_LOGI("close: fd='%d' ", fd);
208208
DefaultRegistry.closeFile(fd);
209209
return 0;
210210
}
211211

212212
int fstat(int fd, struct stat *st) override {
213-
FS_LOGD("fstat: fd='%d' ", fd);
213+
FS_LOGI("fstat: fd='%d' ", fd);
214214
RegEntry &entry = DefaultRegistry.getEntry(fd);
215215
RegContentMemory *p_memory = getContent(entry);
216216
if (p_memory == nullptr || !*p_memory) {
@@ -219,8 +219,8 @@ class FileSystemMemory : public FileSystem {
219219
return statContent(false, entry.file_name,p_memory, st);
220220
}
221221

222-
int stat(const char *path, struct stat *st){
223-
FS_LOGD("stat: path='%s' ", path);
222+
int stat(const char *path, struct stat *st) override {
223+
FS_LOGI("stat: path='%s' ", path);
224224
// find file in registry
225225
RegEntry &mem_entry = get(path);
226226
// if not found it might be a directory
@@ -239,7 +239,7 @@ class FileSystemMemory : public FileSystem {
239239
}
240240

241241
off_t lseek(int fd, off_t offset, int whence) override {
242-
FS_LOGD("lseek: fd='%%' ", fd);
242+
FS_LOGI("lseek: fd='%%' ", fd);
243243
RegEntry &entry = DefaultRegistry.getEntry(fd);
244244
RegContentMemory *p_memory = getContent(entry);
245245
if (p_memory == nullptr) {
@@ -275,7 +275,7 @@ class FileSystemMemory : public FileSystem {
275275

276276
// directory operations
277277
DIR *opendir(const char *name) override {
278-
FS_LOGD("opendir(%s)", name);
278+
FS_LOGI("opendir(%s)", name);
279279
DIR_EXT *result = new DIR_EXT();
280280
result->p_file_system = this;
281281
result->dir = name;
@@ -297,7 +297,7 @@ class FileSystemMemory : public FileSystem {
297297
}
298298

299299
dirent *readdir(DIR *dir) override {
300-
FS_TRACED();
300+
FS_TRACEI();
301301
DIR_EXT *p_dir = (DIR_EXT *)dir;
302302
if (p_dir->pos >= p_dir->files.size()) {
303303
FS_LOGD("==> readdir: pos=%d size=%d END", p_dir->pos,
@@ -322,22 +322,22 @@ class FileSystemMemory : public FileSystem {
322322
}
323323

324324
int closedir(DIR *dir) override {
325-
FS_TRACED();
325+
FS_TRACEI();
326326
DIR_EXT *p_dir = (DIR_EXT *)dir;
327327
if (p_dir != nullptr) {
328328
delete p_dir;
329329
}
330330
return 0;
331331
}
332332

333-
int unlink(const char* path){
333+
int unlink(const char* path) override {
334334
FS_LOGE("unlink not supported");
335335
return -1;
336336
}
337337

338-
virtual void* mem_map(const char* path,size_t *p_size) {
338+
virtual void* mem_map(const char* path,size_t *p_size) override {
339339
const char* name_internal = path+filenameOffset();
340-
FS_LOGD("mem_map(%s)", name_internal);
340+
FS_LOGI("mem_map(%s)", name_internal);
341341
RegEntry &entry = get(name_internal);
342342
if (!entry){
343343
FS_LOGW("mem_map: %s not found", name_internal);
@@ -354,7 +354,7 @@ class FileSystemMemory : public FileSystem {
354354
return (void*)p_memory->data;
355355
}
356356

357-
virtual const char *name() { return FS_NAME_MEM; }
357+
virtual const char *name() override { return FS_NAME_MEM; }
358358

359359
protected:
360360
// Files in Directory

src/FileSystems/FileSystemSD.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class FileSystemSD : public FileSystem {
7373
DefaultRegistry.setFileSystemForSearch(this);
7474
}
7575

76-
int open(const char *path, int flags, int mode) {
76+
int open(const char *path, int flags, int mode) override{
7777
FS_TRACED();
7878
File file = getFS().open(path, getMode(flags));
7979
if (!file) {
@@ -83,25 +83,25 @@ class FileSystemSD : public FileSystem {
8383
return addOpenFile(path, file);
8484
}
8585

86-
ssize_t write(int fd, const void *data, size_t size) {
86+
ssize_t write(int fd, const void *data, size_t size) override{
8787
FS_TRACED();
8888
return getFile(fd).write((uint8_t *)data, size);
8989
}
9090

91-
ssize_t read(int fd, void *data, size_t size) {
91+
ssize_t read(int fd, void *data, size_t size) override{
9292
FS_TRACED();
9393
return getFile(fd).read((uint8_t *)data, size);
9494
}
9595

96-
int close(int fd) {
96+
int close(int fd) override{
9797
FS_TRACED();
9898
getFile(fd).close();
9999
free(files[fd]);
100100
files[fd] = nullptr;
101101
return 0;
102102
}
103103

104-
int fstat(int fd, struct stat *st) {
104+
int fstat(int fd, struct stat *st) override{
105105
FS_TRACED();
106106
File *p_f = &getFile(fd);
107107
st->st_size = p_f->size();
@@ -110,14 +110,14 @@ class FileSystemSD : public FileSystem {
110110
return 0;
111111
}
112112

113-
int stat(const char *path, struct stat *st){
113+
int stat(const char *path, struct stat *st) override{
114114
File file = getFS().open(path, getMode(flags));
115115
st->st_size = p_f->size();
116116
st->st_mode = p_f->isDirectory() ? S_IFDIR : S_IFREG;
117117
file.close();
118118
}
119119

120-
off_t lseek(int fd, off_t offset, int mode) {
120+
off_t lseek(int fd, off_t offset, int mode) override{
121121
FS_TRACED();
122122
// SeekMode { SeekSet = 0, SeekCur = 1, SeekEnd = 2};
123123
#ifdef SEEK_MODE_SUPPORTED
@@ -128,7 +128,7 @@ class FileSystemSD : public FileSystem {
128128
#endif
129129
}
130130

131-
DIR *opendir(const char *path) {
131+
DIR *opendir(const char *path) override{
132132
FS_LOGD("opendir: %s", path);
133133
// remove path prefix if necessary
134134
const char *file_name = path + filenameOffset();
@@ -151,7 +151,7 @@ class FileSystemSD : public FileSystem {
151151
return result;
152152
}
153153

154-
dirent *readdir(DIR *dir) {
154+
dirent *readdir(DIR *dir) override{
155155
FS_TRACED();
156156
DIR_SD *pdir = (DIR_SD *)dir;
157157
File next = pdir->dir.openNextFile();
@@ -168,7 +168,7 @@ class FileSystemSD : public FileSystem {
168168
return &info;
169169
}
170170

171-
int closedir(DIR *pdir) {
171+
int closedir(DIR *pdir) override{
172172
FS_TRACED();
173173
if (pdir != nullptr) {
174174
free(pdir);

0 commit comments

Comments
 (0)