Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel <manuel.coenen@gmail.com>2019-10-16 14:15:22 +0300
committerdc42 <dcrocker@eschertech.com>2019-10-16 14:15:22 +0300
commitd458f6181761f32c3b2e8e3b52083db77cc7fe6c (patch)
tree4d11373ba2ea78c4c263c0d9a7a0ec0eb4349d2e /src/Storage/MassStorage.cpp
parent69f47f96f5c9770cf7daddfee8b912a56b31a893 (diff)
Make MassStorage::CombineName return bool (#328)
Diffstat (limited to 'src/Storage/MassStorage.cpp')
-rw-r--r--src/Storage/MassStorage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp
index 37bd37c8..306be23d 100644
--- a/src/Storage/MassStorage.cpp
+++ b/src/Storage/MassStorage.cpp
@@ -144,7 +144,7 @@ void MassStorage::CloseAllFiles()
}
}
-/*static*/ void MassStorage::CombineName(const StringRef& outbuf, const char* directory, const char* fileName)
+/*static*/ bool MassStorage::CombineName(const StringRef& outbuf, const char* directory, const char* fileName)
{
bool hadError = false;
if (directory != nullptr && directory[0] != 0 && fileName[0] != '/' && (strlen(fileName) < 2 || !isdigit(fileName[0]) || fileName[1] != ':'))
@@ -176,6 +176,7 @@ void MassStorage::CloseAllFiles()
);
outbuf.copy("?????");
}
+ return !hadError;
}
// Open a directory to read a file list. Returns true if it contains any files, false otherwise.