Change the argument of bccPrepareExecutable.
This is almost the last step of the refactoring process of
bccPrepareExecutable. Now, we change the argument of
bccPrepareExecutable, and we will remove bccPrepareExecutableEx
later.
diff --git a/lib/ExecutionEngine/bcc.cpp b/lib/ExecutionEngine/bcc.cpp
index cc2fa51..fef4ce8 100644
--- a/lib/ExecutionEngine/bcc.cpp
+++ b/lib/ExecutionEngine/bcc.cpp
@@ -117,51 +117,11 @@
}
-inline static bool parseOldStyleCachePath(std::string &cacheDir,
- std::string &cacheName,
- std::string const &path) {
- size_t found0 = path.find("@");
- size_t found1 = path.rfind("@");
- size_t found2 = std::string::npos;
-
- if (found0 == found1 ||
- found0 == std::string::npos ||
- found1 == std::string::npos) {
- LOGE("Ill formatted resource name '%s'. The name should contain 2 @s",
- path.c_str());
- return false;
- }
-
- std::string ext(".oBCC");
-
- if (path.size() > ext.size() &&
- path.compare(path.size() - ext.size(), ext.size(), ext) == 0) {
- found2 = path.size() - ext.size();
- }
-
- cacheDir = path.substr(0, found0);
- cacheName = path.substr(found1 + 1, found2 - found1 - 1);
-
- LOGD("cacheDir = %s\n", cacheDir.c_str());
- LOGD("cacheName = %s\n", cacheName.c_str());
- return true;
-}
-
-
extern "C" int bccPrepareExecutable(BCCScriptRef script,
- char const *cachePath,
+ char const *cacheDir,
+ char const *cacheName,
unsigned long flags) {
- BCC_FUNC_LOGGER();
-
- std::string cacheDir, cacheName;
- if (!parseOldStyleCachePath(cacheDir, cacheName, cachePath)) {
- return 1;
- }
-
- return bccPrepareExecutableEx(script,
- cacheDir.c_str(),
- cacheName.c_str(),
- flags);
+ return bccPrepareExecutableEx(script, cacheDir, cacheName, flags);
}