cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmFileSys.h : cmFileSysVMakeFn() can now work with no 'fn' arg.

Browse Source
This commit is contained in:
kevin 2014-01-26 17:08:01 -08:00
parent 92a9b18f44
commit 25932dc723
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmFileSys.c
View File

@ -378,14 +378,13 @@ const cmChar_t* cmFileSysVMakeFn( cmFileSysH_t h, const cmChar_t* dir, const cmC
va_list vl_t;
va_copy(vl_t,vl);
assert( fn != NULL );
// get prefix directory length
if( dir != NULL )
n += strlen(dir) + 1; // add 1 for ending sep
// get file name length
n += strlen(fn);
if( fn != NULL )
n += strlen(fn);
// get extension length
if( ext != NULL )
@ -423,12 +422,13 @@ const cmChar_t* cmFileSysVMakeFn( cmFileSysH_t h, const cmChar_t* dir, const cmC
// copy out the file name
if(!_cmFileSysConcat(rp,n,pathSep,fn))
{
assert(0);
rc = _cmFileSysError(p,kAssertFailFsRC,0,"Assert failed.");
goto errLabel;
}
if( fn != NULL )
if(!_cmFileSysConcat(rp,n,pathSep,fn))
{
assert(0);
rc = _cmFileSysError(p,kAssertFailFsRC,0,"Assert failed.");
goto errLabel;
}
// copy out the extension
if( ext != NULL )

2
cmFileSys.h
View File

@ -35,7 +35,7 @@ extern "C" {
kOsxFailFsRC,
kLinuxFailFsRC,
kInvalidDirFsRC,
kGenFileFailFsRC
kGenFileFailFsRC,
};