Browse Source

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

master
kevin 10 years ago
parent
commit
25932dc723
2 changed files with 10 additions and 10 deletions
  1. 9
    9
      cmFileSys.c
  2. 1
    1
      cmFileSys.h

+ 9
- 9
cmFileSys.c View File

@@ -378,14 +378,13 @@ const cmChar_t* cmFileSysVMakeFn( cmFileSysH_t h, const cmChar_t* dir, const cmC
378 378
   va_list         vl_t;
379 379
   va_copy(vl_t,vl);
380 380
 
381
-  assert( fn != NULL );
382
-
383 381
   // get prefix directory length
384 382
   if( dir != NULL )
385 383
     n += strlen(dir) + 1;  // add 1 for ending sep
386 384
 
387 385
   // get file name length
388
-  n += strlen(fn);
386
+  if( fn != NULL )
387
+    n += strlen(fn);
389 388
 
390 389
   // get extension length
391 390
   if( ext != NULL )
@@ -423,12 +422,13 @@ const cmChar_t* cmFileSysVMakeFn( cmFileSysH_t h, const cmChar_t* dir, const cmC
423 422
 
424 423
 
425 424
   // copy out the file name
426
-  if(!_cmFileSysConcat(rp,n,pathSep,fn))
427
-  {
428
-    assert(0);
429
-    rc = _cmFileSysError(p,kAssertFailFsRC,0,"Assert failed.");
430
-    goto errLabel;
431
-  }
425
+  if( fn != NULL )
426
+    if(!_cmFileSysConcat(rp,n,pathSep,fn))
427
+    {
428
+      assert(0);
429
+      rc = _cmFileSysError(p,kAssertFailFsRC,0,"Assert failed.");
430
+      goto errLabel;
431
+    }
432 432
   
433 433
   // copy out the extension
434 434
   if( ext != NULL )

+ 1
- 1
cmFileSys.h View File

@@ -35,7 +35,7 @@ extern "C" {
35 35
     kOsxFailFsRC,
36 36
     kLinuxFailFsRC,
37 37
     kInvalidDirFsRC,
38
-    kGenFileFailFsRC
38
+    kGenFileFailFsRC,
39 39
   };
40 40
 
41 41
 

Loading…
Cancel
Save