From eb44151507f647c087f1b9acd169797a8af42041 Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Sun, 12 Jul 2026 13:49:24 +0200 Subject: [PATCH] linuxcncrsh: Properly return std::nullopt and not a nullptr. --- src/emc/usr_intf/emcrsh.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/emc/usr_intf/emcrsh.cc b/src/emc/usr_intf/emcrsh.cc index 4ea9f2811a3..a97ba8ad967 100644 --- a/src/emc/usr_intf/emcrsh.cc +++ b/src/emc/usr_intf/emcrsh.cc @@ -485,7 +485,7 @@ static std::optional getIniVar(const std::string &var, const std::s { IniFile inifile(emc_inifile); if(!inifile) - return nullptr; + return std::nullopt; return inifile.findString(var, section); } @@ -1269,11 +1269,13 @@ static cmdResponseType setBrake(connectionRecType &ctx) static std::optional findFilename(const std::string &filename) { if (filename.size() < 1) - return nullptr; + return std::nullopt; struct stat sb; if (filename[0] == '/') { // Absolute path - return !stat(filename.c_str(), &sb) ? filename : nullptr; + if (!stat(filename.c_str(), &sb)) + return filename; + return std::nullopt; } // Relative name, try the search path @@ -1285,7 +1287,9 @@ static std::optional findFilename(const std::string &filename) } // Last resort, try the filename 'as is' - return !stat(filename.c_str(), &sb) ? filename : nullptr; + if (!stat(filename.c_str(), &sb)) + return filename; + return std::nullopt; } static cmdResponseType setLoadToolTable(connectionRecType &ctx)