cpp/openttd-patchpack/source Changeset - r27361:5aa53f16c6f7

Changeset - r27361:5aa53f16c6f7

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

Rubidium - 13 months ago 2023-05-06 11:22:16
rubidium@openttd.org

Codechange: use C++ strings for constructing script file paths

5 files changed with 12 insertions and 17 deletions:

src/fileio.cpp

src/fileio_func.h

src/fios.cpp

src/script/script_scanner.cpp

src/script/squirrel_std.cpp

0 comments (0 inline, 0 general)

src/fileio.cpp

➞

Show inline comments

@@ @@ -1253,7 +1253,7 @@ uint FileScanner::Scan(const char *exten @@
  * @return the number of found files, i.e. the number of times that
  *         AddFile returned true.
  */
-uint FileScanner::Scan(const char *extension, const char *directory, bool recursive)
+uint FileScanner::Scan(const char *extension, const std::string &directory, bool recursive)
+{
 	std::string path(directory);
 	AppendPathSeparator(path);

src/fileio_func.h

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ public: @@
 	virtual ~FileScanner() {}
 	uint Scan(const char *extension, Subdirectory sd, bool tars = true, bool recursive = true);
-	uint Scan(const char *extension, const char *directory, bool recursive = true);
+	uint Scan(const char *extension, const std::string &directory, bool recursive = true);
 	/**
 	 * Add a file with the given filename.

src/fios.cpp

➞

Show inline comments

@@ @@ -410,7 +410,7 @@ static void FiosGetFileList(SaveLoadOper @@
 	/* Show files */
 	FiosFileScanner scanner(fop, callback_proc, file_list);
 	if (subdir == NO_DIRECTORY) {
-		scanner.Scan(nullptr, _fios_path->c_str(), false);
+		scanner.Scan(nullptr, *_fios_path, false);
 	} else {
 		scanner.Scan(nullptr, subdir, true, true);
+	}

src/script/script_scanner.cpp

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ bool ScriptScanner::AddFile(const std::s @@
 	this->main_script = filename;
 	this->tar_file = tar_filename;
-	auto p = this->main_script.rfind(PATHSEPCHAR);
+	auto p = this->main_script.find_last_of(PATHSEPCHAR);
 	this->main_script.erase(p != std::string::npos ? p + 1 : 0);
 	this->main_script += "main.nut";
@@ @@ -229,12 +229,11 @@ static bool IsSameScript(const ContentIn @@
 			checksum.AddFile(tar.first, 0, tar_filename);
+		}
 	} else {
 		char path[MAX_PATH];
 		strecpy(path, info->GetMainScript(), lastof(path));
 		/* There'll always be at least 1 path separator character in a script
 		 * main script name as the search algorithm requires the main script to
 		 * be in a subdirectory of the script directory; so <dir>/<path>/main.nut. */
 		*strrchr(path, PATHSEPCHAR) = '\0';
 		const std::string &main_script = info->GetMainScript();
 		std::string path = main_script.substr(0, main_script.find_last_of(PATHSEPCHAR));
 		checksum.Scan(".nut", path);
+	}

src/script/squirrel_std.cpp

➞

Show inline comments

@@ @@ -53,18 +53,14 @@ SQInteger SquirrelStd::require(HSQUIRREL @@
 		return SQ_ERROR;
+	}
 	char path[MAX_PATH];
 	strecpy(path, si.source, lastof(path));
 	/* Keep the dir, remove the rest */
 	SQChar *s = strrchr(path, PATHSEPCHAR);
 	if (s != nullptr) {
 		/* Keep the PATHSEPCHAR there, remove the rest */
 		s++;
 		*s = '\0';
+	}
 	strecat(path, filename, lastof(path));
 	std::string path = si.source;
 	auto p = path.find_last_of(PATHSEPCHAR);
 	/* Keep the PATHSEPCHAR there, remove the rest */
 	if (p != std::string::npos) path.erase(p + 1);
 	path += filename;
 #if (PATHSEPCHAR != '/')
-	for (char *n = path; *n != '\0'; n++) if (*n == '/') *n = PATHSEPCHAR;
+	std::transform(path.begin(), path.end(), path.begin(), [](char &c) { return c == '/' ? PATHSEPCHAR : c; });
 #endif
 	Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);

0 comments (0 inline, 0 general)