Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitead5f94

Browse files
authored
Correctly using fs:: namespace in SD & SDFS (#8493)
Remove `using namespace fs;` from SDFS.hFix everything that depended on it
1 parentfd53a08 commitead5f94

File tree

2 files changed

+32
-35
lines changed

2 files changed

+32
-35
lines changed

‎libraries/SD/src/SD.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
classSDClass {
3434
public:
35-
booleanbegin(uint8_t csPin,uint32_t cfg = SPI_HALF_SPEED) {
36-
SDFS.setConfig(SDFSConfig(csPin, cfg));
35+
boolbegin(uint8_t csPin,uint32_t cfg = SPI_HALF_SPEED) {
36+
SDFS.setConfig(SDFSConfig(csPin, cfg));
3737
return (boolean)SDFS.begin();
3838
}
3939

@@ -44,19 +44,19 @@ class SDClass {
4444
}
4545
}
4646

47-
Fileopen(constchar *filename,uint8_t mode = FILE_READ) {
47+
fs::Fileopen(constchar *filename,uint8_t mode = FILE_READ) {
4848
return SDFS.open(filename,getMode(mode));
4949
}
5050

51-
Fileopen(constchar *filename,constchar *mode) {
51+
fs::Fileopen(constchar *filename,constchar *mode) {
5252
return SDFS.open(filename, mode);
5353
}
5454

55-
Fileopen(const String &filename,uint8_t mode = FILE_READ) {
55+
fs::Fileopen(const String &filename,uint8_t mode = FILE_READ) {
5656
returnopen(filename.c_str(), mode);
5757
}
5858

59-
Fileopen(const String &filename,constchar *mode) {
59+
fs::Fileopen(const String &filename,constchar *mode) {
6060
returnopen(filename.c_str(), mode);
6161
}
6262

‎libraries/SDFS/src/SDFS.h‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,17 @@
2929
*/
3030
#include<limits>
3131
#include<assert.h>
32-
#include"FS.h"
33-
#include"FSImpl.h"
32+
#include<FSImpl.h>
3433
#include"debug.h"
3534
#include<SPI.h>
3635
#include<SdFat.h>
3736
#include<FS.h>
3837

39-
usingnamespacefs;
40-
4138
namespacesdfs {
4239

4340
classSDFSFileImpl;
4441
classSDFSDirImpl;
45-
classSDFSConfig :publicFSConfig
42+
classSDFSConfig :publicfs::FSConfig
4643
{
4744
public:
4845
staticconstexpruint32_t FSId =0x53444653;
@@ -72,26 +69,26 @@ class SDFSConfig : public FSConfig
7269
uint32_t _spiSettings;
7370
};
7471

75-
classSDFSImpl :publicFSImpl
72+
classSDFSImpl :publicfs::FSImpl
7673
{
7774
public:
7875
SDFSImpl() : _mounted(false)
7976
{
8077
}
8178

82-
FileImplPtropen(constchar* path, OpenMode openMode, AccessMode accessMode)override;
79+
fs::FileImplPtropen(constchar* path,fs::OpenMode openMode,fs::AccessMode accessMode)override;
8380

8481
boolexists(constchar* path)override {
8582
return _mounted ? _fs.exists(path) :false;
8683
}
8784

88-
DirImplPtropenDir(constchar* path)override;
85+
fs::DirImplPtropenDir(constchar* path)override;
8986

9087
boolrename(constchar* pathFrom,constchar* pathTo)override {
9188
return _mounted ? _fs.rename(pathFrom, pathTo) :false;
9289
}
9390

94-
boolinfo64(FSInfo64& info)override {
91+
boolinfo64(fs::FSInfo64& info)override {
9592
if (!_mounted) {
9693
DEBUGV("SDFS::info: FS not mounted\n");
9794
returnfalse;
@@ -105,8 +102,8 @@ class SDFSImpl : public FSImpl
105102
returntrue;
106103
}
107104

108-
boolinfo(FSInfo& info)override {
109-
FSInfo64 i;
105+
boolinfo(fs::FSInfo& info)override {
106+
fs::FSInfo64 i;
110107
if (!info64(i)) {
111108
returnfalse;
112109
}
@@ -137,7 +134,7 @@ class SDFSImpl : public FSImpl
137134
return _mounted ?_fs.rmdir(path) :false;
138135
}
139136

140-
boolsetConfig(const FSConfig &cfg)override
137+
boolsetConfig(constfs::FSConfig &cfg)override
141138
{
142139
if ((cfg._type != SDFSConfig::FSId) || _mounted) {
143140
DEBUGV("SDFS::setConfig: invalid config or already mounted\n");
@@ -234,22 +231,22 @@ class SDFSImpl : public FSImpl
234231
}
235232

236233

237-
staticuint8_t_getFlags(OpenMode openMode, AccessMode accessMode) {
234+
staticuint8_t_getFlags(fs::OpenMode openMode,fs::AccessMode accessMode) {
238235
uint8_t mode =0;
239-
if (openMode & OM_CREATE) {
236+
if (openMode &fs::OM_CREATE) {
240237
mode |= O_CREAT;
241238
}
242-
if (openMode & OM_APPEND) {
239+
if (openMode &fs::OM_APPEND) {
243240
mode |= O_AT_END;
244241
}
245-
if (openMode & OM_TRUNCATE) {
242+
if (openMode &fs::OM_TRUNCATE) {
246243
mode |= O_TRUNC;
247244
}
248-
if ((accessMode & (AM_READ | AM_WRITE)) == (AM_READ | AM_WRITE)) {
245+
if ((accessMode & (fs::AM_READ |fs::AM_WRITE)) == (fs::AM_READ |fs::AM_WRITE)) {
249246
mode |= O_RDWR;
250-
}elseif (accessMode & AM_READ) {
247+
}elseif (accessMode &fs::AM_READ) {
251248
mode |= O_READ;
252-
}elseif (accessMode & AM_WRITE) {
249+
}elseif (accessMode &fs::AM_WRITE) {
253250
mode |= O_WRITE;
254251
}
255252
return mode;
@@ -261,7 +258,7 @@ class SDFSImpl : public FSImpl
261258
};
262259

263260

264-
classSDFSFileImpl :publicFileImpl
261+
classSDFSFileImpl :publicfs::FileImpl
265262
{
266263
public:
267264
SDFSFileImpl(SDFSImpl *fs, std::shared_ptr<File32> fd,constchar *name)
@@ -299,22 +296,22 @@ class SDFSFileImpl : public FileImpl
299296
}
300297
}
301298

302-
boolseek(uint32_t pos, SeekMode mode)override
299+
boolseek(uint32_t pos,fs::SeekMode mode)override
303300
{
304301
if (!_opened) {
305302
returnfalse;
306303
}
307304
switch (mode) {
308-
case SeekSet:
305+
casefs::SeekSet:
309306
return _fd->seekSet(pos);
310-
case SeekEnd:
307+
casefs::SeekEnd:
311308
return _fd->seekEnd(-pos);// TODO again, odd from POSIX
312-
case SeekCur:
309+
casefs::SeekCur:
313310
return _fd->seekCur(pos);
314311
default:
315312
// Should not be hit, we've got an invalid seek mode
316313
DEBUGV("SDFSFileImpl::seek: invalid seek mode %d\n", mode);
317-
assert((mode==SeekSet) || (mode==SeekEnd) || (mode==SeekCur));// Will fail and give meaningful assert message
314+
assert((mode==fs::SeekSet) || (mode==fs::SeekEnd) || (mode==fs::SeekCur));// Will fail and give meaningful assert message
318315
returnfalse;
319316
}
320317
}
@@ -406,7 +403,7 @@ class SDFSFileImpl : public FileImpl
406403
bool _opened;
407404
};
408405

409-
classSDFSDirImpl :publicDirImpl
406+
classSDFSDirImpl :publicfs::DirImpl
410407
{
411408
public:
412409
SDFSDirImpl(const String& pattern, SDFSImpl* fs, std::shared_ptr<File32> dir,constchar *dirPath =nullptr)
@@ -423,10 +420,10 @@ class SDFSDirImpl : public DirImpl
423420
_dir->close();
424421
}
425422

426-
FileImplPtropenFile(OpenMode openMode, AccessMode accessMode)override
423+
fs::FileImplPtropenFile(fs::OpenMode openMode,fs::AccessMode accessMode)override
427424
{
428425
if (!_valid) {
429-
returnFileImplPtr();
426+
returnfs::FileImplPtr();
430427
}
431428
// MAX_PATH on FAT32 is potentially 260 bytes per most implementations
432429
char tmpName[260];
@@ -532,7 +529,7 @@ class SDFSDirImpl : public DirImpl
532529
};// namespace sdfs
533530

534531
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SDFS)
535-
extern FS SDFS;
532+
externfs::FS SDFS;
536533
using sdfs::SDFSConfig;
537534
#endif
538535

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp