|
@@ -48,7 +48,7 @@
|
48
|
48
|
// public:
|
49
|
49
|
|
50
|
50
|
card_flags_t CardReader::flag;
|
51
|
|
-char CardReader::filename[FILENAME_LENGTH + 1], CardReader::longFilename[LONG_FILENAME_LENGTH + 1];
|
|
51
|
+char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH];
|
52
|
52
|
int8_t CardReader::autostart_index;
|
53
|
53
|
|
54
|
54
|
#if ENABLED(FAST_FILE_TRANSFER)
|
|
@@ -82,11 +82,11 @@ uint8_t CardReader::workDirDepth;
|
82
|
82
|
#if ENABLED(SDSORT_DYNAMIC_RAM)
|
83
|
83
|
char **CardReader::sortshort, **CardReader::sortnames;
|
84
|
84
|
#else
|
85
|
|
- char CardReader::sortshort[SDSORT_LIMIT][FILENAME_LENGTH + 1];
|
86
|
|
- char CardReader::sortnames[SDSORT_LIMIT][SORTED_LONGNAME_MAXLEN + 1];
|
|
85
|
+ char CardReader::sortshort[SDSORT_LIMIT][FILENAME_LENGTH];
|
|
86
|
+ char CardReader::sortnames[SDSORT_LIMIT][SORTED_LONGNAME_MAXLEN];
|
87
|
87
|
#endif
|
88
|
88
|
#elif DISABLED(SDSORT_USES_STACK)
|
89
|
|
- char CardReader::sortnames[SDSORT_LIMIT][SORTED_LONGNAME_MAXLEN + 1];
|
|
89
|
+ char CardReader::sortnames[SDSORT_LIMIT][SORTED_LONGNAME_MAXLEN];
|
90
|
90
|
#endif
|
91
|
91
|
|
92
|
92
|
#if HAS_FOLDER_SORTING
|
|
@@ -107,7 +107,7 @@ SdFile CardReader::file;
|
107
|
107
|
|
108
|
108
|
uint8_t CardReader::file_subcall_ctr;
|
109
|
109
|
uint32_t CardReader::filespos[SD_PROCEDURE_DEPTH];
|
110
|
|
-char CardReader::proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH + 1];
|
|
110
|
+char CardReader::proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
|
111
|
111
|
|
112
|
112
|
uint32_t CardReader::filesize, CardReader::sdpos;
|
113
|
113
|
|
|
@@ -183,7 +183,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
|
183
|
183
|
if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) {
|
184
|
184
|
|
185
|
185
|
// Get the short name for the item, which we know is a folder
|
186
|
|
- char dosFilename[FILENAME_LENGTH + 1];
|
|
186
|
+ char dosFilename[FILENAME_LENGTH];
|
187
|
187
|
createFilename(dosFilename, p);
|
188
|
188
|
|
189
|
189
|
// Allocate enough stack space for the full path to a folder, trailing slash, and nul
|
|
@@ -350,7 +350,7 @@ void CardReader::printFilename(
|
350
|
350
|
#endif
|
351
|
351
|
) {
|
352
|
352
|
if (file.isOpen()) {
|
353
|
|
- char dosFilename[FILENAME_LENGTH + 1];
|
|
353
|
+ char dosFilename[FILENAME_LENGTH];
|
354
|
354
|
file.getFilename(dosFilename);
|
355
|
355
|
SERIAL_ECHO_P(port, dosFilename);
|
356
|
356
|
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
|
|
@@ -856,7 +856,7 @@ void CardReader::setroot() {
|
856
|
856
|
sortnames = new char*[fileCnt];
|
857
|
857
|
#endif
|
858
|
858
|
#elif ENABLED(SDSORT_USES_STACK)
|
859
|
|
- char sortnames[fileCnt][SORTED_LONGNAME_MAXLEN + 1];
|
|
859
|
+ char sortnames[fileCnt][SORTED_LONGNAME_MAXLEN];
|
860
|
860
|
#endif
|
861
|
861
|
|
862
|
862
|
// Folder sorting needs 1 bit per entry for flags.
|
|
@@ -873,7 +873,7 @@ void CardReader::setroot() {
|
873
|
873
|
// By default re-read the names from SD for every compare
|
874
|
874
|
// retaining only two filenames at a time. This is very
|
875
|
875
|
// slow but is safest and uses minimal RAM.
|
876
|
|
- char name1[LONG_FILENAME_LENGTH + 1];
|
|
876
|
+ char name1[LONG_FILENAME_LENGTH];
|
877
|
877
|
|
878
|
878
|
#endif
|
879
|
879
|
|