From: <kin...@us...> - 2008-06-25 23:38:07
|
Revision: 3864 http://teem.svn.sourceforge.net/teem/?rev=3864&view=rev Author: kindlmann Date: 2008-06-25 16:38:11 -0700 (Wed, 25 Jun 2008) Log Message: ----------- tracking change from _nrrdContainsPercentDAndMore to _nrrdContainsPercentThisAndMore Modified Paths: -------------- teem/trunk/src/unrrdu/dice.c teem/trunk/src/unrrdu/make.c Modified: teem/trunk/src/unrrdu/dice.c =================================================================== --- teem/trunk/src/unrrdu/dice.c 2008-06-25 23:36:45 UTC (rev 3863) +++ teem/trunk/src/unrrdu/dice.c 2008-06-25 23:38:11 UTC (rev 3864) @@ -77,11 +77,15 @@ airMopError(mop); return 1; } - + + /* HEY: this should use nrrdSaveMulti(), and if there's additional + smarts here, they should be moved into nrrdSaveMulti() */ if (airStrlen(ftmpl)) { - if (!_nrrdContainsPercentDAndMore(ftmpl)) { + if (!( _nrrdContainsPercentThisAndMore(ftmpl, 'd') + || _nrrdContainsPercentThisAndMore(ftmpl, 'u') )) { fprintf(stderr, "%s: given filename format \"%s\" doesn't seem to " - "have the format sequence to print an integer\n", me, ftmpl); + "have the converstion specification to print an integer\n", + me, ftmpl); airMopError(mop); return 1; } Modified: teem/trunk/src/unrrdu/make.c =================================================================== --- teem/trunk/src/unrrdu/make.c 2008-06-25 23:36:45 UTC (rev 3863) +++ teem/trunk/src/unrrdu/make.c 2008-06-25 23:38:11 UTC (rev 3864) @@ -311,7 +311,7 @@ /* have to simulate having parsed this line for error checking in _nrrdDataFNCheck() to not cause problems */ nio->seen[nrrdField_sizes] = AIR_TRUE; - if (_nrrdContainsPercentDAndMore(dataFileNames[0])) { + if (_nrrdContainsPercentThisAndMore(dataFileNames[0], 'd')) { /* trying to do a formatted filename list */ if (nameLen < 4 || nameLen > 5) { fprintf(stderr, "%s: formatted list of filenames needs between " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |