arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-06 18:19:16 +03:00
Code

SD: change 'char *' parameters to 'const char *' to fix bad recursion (#2398)

Browse Source
This commit is contained in:
martinayotte 2016-08-22 09:11:34 -04:00 committed by Ivan Grokhotkov
parent 497d19d039
commit 4754f4317c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/SD/src/SD.cpp
View File

@ -56,7 +56,7 @@
#define MAX_COMPONENT_LEN 12 // What is max length? #define MAX_COMPONENT_LEN 12 // What is max length?
#define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1 #define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1
bool getNextPathComponent(char *path, unsigned int *p_offset, bool getNextPathComponent(const char *path, unsigned int *p_offset,
char *buffer) { char *buffer) {
/* /*
@ -115,7 +115,7 @@ bool getNextPathComponent(char *path, unsigned int *p_offset,
boolean walkPath(char *filepath, SdFile& parentDir, boolean walkPath(const char *filepath, SdFile& parentDir,
boolean (*callback)(SdFile& parentDir, boolean (*callback)(SdFile& parentDir,
char *filePathComponent, char *filePathComponent,
boolean isLastComponent, boolean isLastComponent,
@ -513,7 +513,7 @@ File SDClass::open(char *filepath, uint8_t mode) {
//} //}
boolean SDClass::exists(char *filepath) { boolean SDClass::exists(const char *filepath) {
/* /*
Returns true if the supplied file path exists. Returns true if the supplied file path exists.
@ -534,7 +534,7 @@ boolean SDClass::exists(char *filepath) {
//} //}
boolean SDClass::mkdir(char *filepath) { boolean SDClass::mkdir(const char *filepath) {
/* /*
Makes a single directory or a heirarchy of directories. Makes a single directory or a heirarchy of directories.
@ -545,7 +545,7 @@ boolean SDClass::mkdir(char *filepath) {
return walkPath(filepath, root, callback_makeDirPath); return walkPath(filepath, root, callback_makeDirPath);
} }
boolean SDClass::rmdir(char *filepath) { boolean SDClass::rmdir(const char *filepath) {
/* /*
Remove a single directory or a heirarchy of directories. Remove a single directory or a heirarchy of directories.
@ -556,7 +556,7 @@ boolean SDClass::rmdir(char *filepath) {
return walkPath(filepath, root, callback_rmdir); return walkPath(filepath, root, callback_rmdir);
} }
boolean SDClass::remove(char *filepath) { boolean SDClass::remove(const char *filepath) {
return walkPath(filepath, root, callback_remove); return walkPath(filepath, root, callback_remove);
} }

8
libraries/SD/src/SD.h
View File

@ -96,19 +96,19 @@ public:
File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); } File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); }
// Methods to determine if the requested file path exists. // Methods to determine if the requested file path exists.
boolean exists(char *filepath); boolean exists(const char *filepath);
boolean exists(const String &filepath) { return exists(filepath.c_str()); } boolean exists(const String &filepath) { return exists(filepath.c_str()); }
// Create the requested directory heirarchy--if intermediate directories // Create the requested directory heirarchy--if intermediate directories
// do not exist they will be created. // do not exist they will be created.
boolean mkdir(char *filepath); boolean mkdir(const char *filepath);
boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); } boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); }
// Delete the file. // Delete the file.
boolean remove(char *filepath); boolean remove(const char *filepath);
boolean remove(const String &filepath) { return remove(filepath.c_str()); } boolean remove(const String &filepath) { return remove(filepath.c_str()); }
boolean rmdir(char *filepath); boolean rmdir(const char *filepath);
boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); } boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); }
uint8_t type(){ return card.type(); } uint8_t type(){ return card.type(); }