Skip to content

GitLab

Commits (2)
  • Robert Sprowson's avatar
    Fix pointer compare confusion · f14730d1
    Robert Sprowson authored 
    OpsFunc.c: don't compare fname with a null string, when a NULL pointer was intended
Found by cppcheck static analysis.

Version 1.14. Tagged as 'DOSFS-1_14'
    f14730d1
  • Timothy E Baldwin's avatar
    Fix cleaning · 774c67f3
    Timothy E Baldwin authored 
    Move .gitignore file to root and populate with all temporary paths.
This fixes .gitignore files being deleted during a ROM build.


Version 1.14. Not tagged
    774c67f3
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
.gitignore 0 → 100644
View file @ 774c67f3
/Makefile.d
/aif/
/aof/
/gpa/
/h/DOSFSHdr
/i/
/linked/
/o/
/od/
/rm/
VersionNum
View file @ 774c67f3
/* (1.13)
/* (1.14)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.13
#define Module_MajorVersion_CMHG 1.14
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Feb 2018
#define Module_Date_CMHG 24 Jul 2018
#define Module_MajorVersion "1.13"
#define Module_Version 113
#define Module_MajorVersion "1.14"
#define Module_Version 114
#define Module_MinorVersion ""
#define Module_Date "19 Feb 2018"
#define Module_Date "24 Jul 2018"
#define Module_ApplicationDate "19-Feb-18"
#define Module_ApplicationDate "24-Jul-18"
#define Module_ComponentName "DOSFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ImageFS/DOSFS"
#define Module_FullVersion "1.13"
#define Module_HelpVersion "1.13 (19 Feb 2018)"
#define Module_LibraryVersionInfo "1:13"
#define Module_FullVersion "1.14"
#define Module_HelpVersion "1.14 (24 Jul 2018)"
#define Module_LibraryVersionInfo "1:14"
c/OpsFunc
View file @ 774c67f3
......@@ -242,7 +242,7 @@ int DOSFS_rename(char *oldname,char *newname,DOSdisc *ihand)
*/
FS_dir_block *DOSFS_read_dir(char *fname, void *dest, word num, word off, word blen, DOSdisc *ihand)
{
dprintf(("","\n\nDOSFS_read_dir: \"%s\" (dest = &%08X) %d %d %d\n",((fname == "") ? "NULLptr" : fname),dest,num,off,blen));
dprintf(("","\n\nDOSFS_read_dir: \"%s\" (dest = &%08X) %d %d %d\n",fname == NULL ? "NULLptr" : fname,dest,num,off,blen));
return (read_dir(0, fname, dest, num, off, blen, ihand)) ;
}
......@@ -258,7 +258,7 @@ FS_dir_block *DOSFS_read_dir(char *fname, void *dest, word num, word off, word b
*/
FS_dir_block *DOSFS_read_dir_info(char *fname, void *dest, word num, word off, word blen, DOSdisc *ihand)
{
dprintf(("","\n\nDOSFS_read_dir_info: \"%s\" (dest = &%08X) %d %d %d\n",((fname == "") ? "NULLptr" : fname),dest,num,off,blen));
dprintf(("","\n\nDOSFS_read_dir_info: \"%s\" (dest = &%08X) %d %d %d\n",fname == NULL ? "NULLptr" : fname,dest,num,off,blen));
return (read_dir(-1, fname, dest, num, off, blen, ihand)) ;
}
......