Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable removal of virtual filesystems #8772

Merged
merged 4 commits into from
Dec 3, 2023
Merged

Enable removal of virtual filesystems #8772

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
058318f
enable removal of file handlers
Maxxen Nov 21, 2023
2d94587
format
Maxxen Nov 21, 2023
7a077a0
add test, comments
Maxxen Dec 3, 2023
0a0e701
remove extra test
Maxxen Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions port/cpl_vsi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,13 @@ void CPL_DLL VSIFreeFilesystemPluginCallbacksStruct(
int CPL_DLL VSIInstallPluginHandler(
const char *pszPrefix, const VSIFilesystemPluginCallbacksStruct *poCb);

/**
* Unregister a handler previously installed with VSIInstallPluginHandler() on
* the given prefix.
* @since GDAL 3.9
Maxxen marked this conversation as resolved.
Show resolved Hide resolved
*/
int CPL_DLL VSIRemovePluginHandler(const char *pszPrefix);

/* ==================================================================== */
/* Time querying. */
/* ==================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions port/cpl_vsi_virtual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,7 @@ class CPL_DLL VSIFileManager
static VSIFilesystemHandler *GetHandler(const char *);
static void InstallHandler(const std::string &osPrefix,
VSIFilesystemHandler *);
/* RemoveHandler is never defined. */
/* static void RemoveHandler( const std::string& osPrefix ); */
static void RemoveHandler(const std::string &osPrefix);

static char **GetPrefixes();
};
Expand Down
12 changes: 12 additions & 0 deletions port/cpl_vsil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3253,6 +3253,18 @@ void VSIFileManager::InstallHandler(const std::string &osPrefix,
Get()->oHandlers[osPrefix] = poHandler;
}

/************************************************************************/
/* RemoveHandler() */
/************************************************************************/

void VSIFileManager::RemoveHandler(const std::string &osPrefix)
{
if (osPrefix == "")
Get()->poDefaultHandler = nullptr;
else
Get()->oHandlers.erase(osPrefix);
}

/************************************************************************/
/* VSICleanupFileManager() */
/************************************************************************/
Expand Down
6 changes: 6 additions & 0 deletions port/cpl_vsil_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,12 @@ int VSIInstallPluginHandler(const char *pszPrefix,
return 0;
}

int VSIRemovePluginHandler(const char *pszPrefix)
{
VSIFileManager::RemoveHandler(pszPrefix);
return 0;
}

VSIFilesystemPluginCallbacksStruct *
VSIAllocFilesystemPluginCallbacksStruct(void)
{
Expand Down
Loading