RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

filesystem: small refactoring, remove double nullptr checks

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-05 14:12:01 +05:00
committed by a1batross
parent 086cb6aab8
commit 95cc6c4445
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
filesystem/filesystem.c
View File

@@ -3204,16 +3204,6 @@ qboolean FS_Rename( const char *oldname, const char *newname )
if( FS_CheckNastyPath( oldname ) || FS_CheckNastyPath( newname )) if( FS_CheckNastyPath( oldname ) || FS_CheckNastyPath( newname ))
return false; return false;
if( !fs_writepath )
return false;
if( COM_StringEmptyOrNULL( oldname ) || COM_StringEmptyOrNULL( newname ))
return false;
// no work done
if( !Q_stricmp( oldname, newname ))
return true;
// fix up slashes // fix up slashes
Q_strncpy( oldname2, oldname, sizeof( oldname2 )); Q_strncpy( oldname2, oldname, sizeof( oldname2 ));
Q_strncpy( newname2, newname, sizeof( newname2 )); Q_strncpy( newname2, newname, sizeof( newname2 ));
@@ -3221,6 +3211,14 @@ qboolean FS_Rename( const char *oldname, const char *newname )
COM_FixSlashes( oldname2 ); COM_FixSlashes( oldname2 );
COM_FixSlashes( newname2 ); COM_FixSlashes( newname2 );
// no work done
if( !Q_stricmp( oldname2, newname2 ))
return true;
// no writing directory is set, no changes should be made
if( !fs_writepath )
return false;
// file does not exist // file does not exist
if( !FS_FixFileCase( fs_writepath->dir, oldname2, oldpath, sizeof( oldpath ), false )) if( !FS_FixFileCase( fs_writepath->dir, oldname2, oldpath, sizeof( oldpath ), false ))
return false; return false;
@@ -3256,7 +3254,7 @@ qboolean GAME_EXPORT FS_Delete( const char *path )
if( FS_CheckNastyPath( path )) if( FS_CheckNastyPath( path ))
return false; return false;
if( !fs_writepath || COM_StringEmptyOrNULL( path )) if( !fs_writepath )
return false; return false;
Q_strncpy( path2, path, sizeof( path2 )); Q_strncpy( path2, path, sizeof( path2 ));