Skip to content

Commit 35fdf8e

Browse files
committed
Remove faulty SdFile nullptr checks
Fix #694. SdFile creates a nullptr instance. Testing against the instance for nullptr returns false positive.
1 parent 31da201 commit 35fdf8e

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

Firmware/RTK_Everywhere/Developer.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ void webServerStop() {}
175175
void webServerUpdate() {}
176176
void webServerVerifyTables() {}
177177
void wifiSettingsClone() {}
178+
bool webServerIsRunning() {return false;}
178179

179180
#endif // COMPILE_AP
180181

Firmware/RTK_Everywhere/NTP.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ void ntpServerUpdate()
914914

915915
if (ntpFileExists)
916916
{
917-
if (ntpFile && ntpFile.open(fileName, O_APPEND | O_WRITE))
917+
if (ntpFile.open(fileName, O_APPEND | O_WRITE))
918918
{
919919
fileOpen = true;
920920
sdUpdateFileCreateTimestamp(&ntpFile);

Firmware/RTK_Everywhere/menuBase.ino

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,14 +637,9 @@ void recordLineToSD(const char *fileName, const char *lineData)
637637
gotSemaphore = true;
638638

639639
SdFile file;
640-
if (!file)
641-
{
642-
systemPrintln("ERROR - Failed to allocate file");
643-
break;
644-
}
645640
if (file.open(fileName, O_CREAT | O_APPEND | O_WRITE) == false)
646641
{
647-
log_d("File %s not found", fileName);
642+
systemPrintf("recordLineToSD: Failed to modify %s\n\r", fileName);
648643
break;
649644
}
650645

Firmware/RTK_Everywhere/menuFirmware.ino

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,6 @@ void microSDUpdateFirmware(const char *firmwareFileName)
370370

371371
// Verify that the SdFile object can be allocated
372372
SdFile firmwareFile;
373-
if (!firmwareFile)
374-
{
375-
systemPrintln("ERROR - Failed to allocate firmwareFile");
376-
return;
377-
}
378373

379374
// Verify that the firmware file can be opened
380375
if (!firmwareFile.open(firmwareFileName, O_READ))

0 commit comments

Comments
 (0)