TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unused return code of PHYSFSX_removeRelFromSearchPath

Browse source
This commit is contained in:
Kp 2021-07-25 23:00:56 +00:00
parent c26fd86450
commit 1227625e7c
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/physfsx.h
View file

@ -387,8 +387,6 @@ static inline void PHYSFSX_readMatrix(const char *const filename, const unsigned
#define PHYSFSX_readMatrix(M,F) ((PHYSFSX_readMatrix)(__FILE__, __LINE__, __func__, (M), (F)))
#define PHYSFSX_contfile_close PHYSFSX_removeRelFromSearchPath
class PHYSFS_File_deleter
{
public:
@ -444,7 +442,7 @@ enum class physfs_search_path : int
};
int PHYSFSX_addRelToSearchPath(const char *relname, std::array<char, PATH_MAX> &realPath, physfs_search_path);
extern int PHYSFSX_removeRelFromSearchPath(const char *relname);
void PHYSFSX_removeRelFromSearchPath(const char *relname);
extern int PHYSFSX_fsize(const char *hogname);
extern void PHYSFSX_listSearchPathContent();
int PHYSFSX_getRealPath(const char *stdPath, std::array<char, PATH_MAX> &realPath);

2
similar/main/mission.cpp
View file

@ -1019,7 +1019,7 @@ static const char *load_mission(const mle *const mission)
}
#if defined(DXX_BUILD_DESCENT_II)
else
PHYSFSX_contfile_close("descent.hog");
PHYSFSX_removeRelFromSearchPath("descent.hog");
#endif
#if defined(DXX_BUILD_DESCENT_II)

5
similar/misc/physfsx.cpp
View file

@ -309,7 +309,7 @@ int PHYSFSX_addRelToSearchPath(const char *relname, std::array<char, PATH_MAX> &
return r;
}
int PHYSFSX_removeRelFromSearchPath(const char *relname)
void PHYSFSX_removeRelFromSearchPath(const char *relname)
{
char relname2[PATH_MAX];
@ -320,14 +320,13 @@ int PHYSFSX_removeRelFromSearchPath(const char *relname)
if (!PHYSFSX_getRealPath(relname2, pathname))
{
con_printf(CON_DEBUG, "PHYSFS: ignoring unmap request: no canonical path for relative name \"%s\"", relname2);
return 0;
return;
}
auto r = PHYSFS_unmount(pathname.data());
if (r)
con_printf(CON_DEBUG, "PHYSFS: unmap canonical directory \"%s\" (relative name \"%s\")", pathname.data(), relname);
else
con_printf(CON_VERBOSE, "PHYSFS: failed to unmap canonical directory \"%s\" (relative name \"%s\"): \"%s\"", pathname.data(), relname, PHYSFS_getLastError());
return r;
}
int PHYSFSX_fsize(const char *hogname)