From 7d86a0d1214a7f20a52f694624651092e0147a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 15 Feb 2022 06:36:49 +0000 Subject: [PATCH] Reduce a few magic numbers for FILENAME_LENGTH flash: 0 RAM: 0 --- Firmware/Marlin_main.cpp | 2 +- Firmware/SdBaseFile.cpp | 2 +- Firmware/cardreader.cpp | 2 +- Firmware/cardreader.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4123c6e8e..2875cf93e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -11313,7 +11313,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { int feedmultiply_rec; uint8_t fan_speed_rec; char cmd[48]; - char filename[13]; + char filename[FILENAME_LENGTH]; uint8_t depth = 0; char dir_name[9]; diff --git a/Firmware/SdBaseFile.cpp b/Firmware/SdBaseFile.cpp index e3b1c18c8..08b55651a 100644 --- a/Firmware/SdBaseFile.cpp +++ b/Firmware/SdBaseFile.cpp @@ -1015,7 +1015,7 @@ void SdBaseFile::printFatTime( uint16_t fatTime) { * the value zero, false, is returned for failure. */ bool SdBaseFile::printName() { - char name[13]; + char name[FILENAME_LENGTH]; if (!getFilename(name)) return false; MYSERIAL.print(name); return true; diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 027281af6..ba618412a 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -304,7 +304,7 @@ void CardReader::getAbsFilename(char *t) while(*t!=0 && cnt< MAXPATHNAMELENGTH) {t++;cnt++;} //crawl counter forward. } - if(cnt