diff options
| -rw-r--r-- | src/filemanager.cpp | 13 | ||||
| -rw-r--r-- | src/networkfilemanager.cpp | 8 | ||||
| -rw-r--r-- | test/unit/proj_context_test.cpp | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/filemanager.cpp b/src/filemanager.cpp index e299b08f..a5bb779c 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1181,7 +1181,8 @@ void proj_context_set_sqlite3_vfs_name(PJ_CONTEXT *ctx, const char *name) { /** Get the PROJ user writable directory for datumgrid files. * * @param ctx PROJ context, or NULL - * @param create If set to TRUE, create the directory if it does not exist already. + * @param create If set to TRUE, create the directory if it does not exist + * already. * @return The path to the PROJ user writable directory. * @since 7.1 */ @@ -1251,7 +1252,7 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx, * by a later call to proj_context_set_url_endpoint() * @since 7.1 */ -const char* proj_context_get_url_endpoint(PJ_CONTEXT *ctx) { +const char *proj_context_get_url_endpoint(PJ_CONTEXT *ctx) { if (ctx == nullptr) { ctx = pj_get_default_ctx(); } @@ -1504,9 +1505,11 @@ pj_open_lib_internal(projCtx ctx, const char *name, const char *mode, else if (!dontReadUserWritableDirectory() && (fid = open_file( - ctx, (std::string(proj_context_get_user_writable_directory(ctx, false)) + - DIR_CHAR + name) - .c_str(), + ctx, + (std::string(proj_context_get_user_writable_directory( + ctx, false)) + + DIR_CHAR + name) + .c_str(), mode)) != nullptr) { fname = proj_context_get_user_writable_directory(ctx, false); fname += DIR_CHAR; diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp index 7cc0599e..30229fea 100644 --- a/src/networkfilemanager.cpp +++ b/src/networkfilemanager.cpp @@ -2213,7 +2213,8 @@ int proj_is_download_needed(PJ_CONTEXT *ctx, const char *url_or_filename, if (filename == nullptr) return false; const auto localFilename( - std::string(proj_context_get_user_writable_directory(ctx, false)) + filename); + std::string(proj_context_get_user_writable_directory(ctx, false)) + + filename); auto f = NS_PROJ::FileManager::open(ctx, localFilename.c_str(), NS_PROJ::FileAccess::READ_ONLY); @@ -2351,8 +2352,9 @@ int proj_download_file(PJ_CONTEXT *ctx, const char *url_or_filename, const char *filename = strrchr(url.c_str(), '/'); if (filename == nullptr) return false; - const auto localFilename(std::string(proj_context_get_user_writable_directory(ctx, true)) + - filename); + const auto localFilename( + std::string(proj_context_get_user_writable_directory(ctx, true)) + + filename); #ifdef _WIN32 const int nPID = GetCurrentProcessId(); diff --git a/test/unit/proj_context_test.cpp b/test/unit/proj_context_test.cpp index ccd74f4a..4d8df380 100644 --- a/test/unit/proj_context_test.cpp +++ b/test/unit/proj_context_test.cpp @@ -154,7 +154,8 @@ TEST(proj_context, proj_context_set_search_paths) { TEST(proj_context, read_grid_from_user_writable_directory) { auto ctx = proj_context_create(); - auto path = std::string(proj_context_get_user_writable_directory(ctx, true)); + auto path = + std::string(proj_context_get_user_writable_directory(ctx, true)); EXPECT_TRUE(!path.empty()); auto filename = path + DIR_CHAR + "temp_proj_dic3"; EXPECT_TRUE(createTmpFile(filename)); |