|
From: <kin...@us...> - 2004-03-13 20:12:04
|
Update of /cvsroot/teem/teem/src/unrrdu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26582/unrrdu Modified Files: axinfo.c axinsert.c flotsam.c join.c make.c Log Message: killed off AIR_FREE and AIR_FCLOSE macros- they were just way too cute for their own good Index: axinfo.c =================================================================== RCS file: /cvsroot/teem/teem/src/unrrdu/axinfo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** axinfo.c 7 Jan 2004 15:34:31 -0000 1.3 --- axinfo.c 13 Mar 2004 20:03:11 -0000 1.4 *************** *** 81,85 **** if (strlen(label)) { ! AIR_FREE(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } --- 81,85 ---- if (strlen(label)) { ! nout->axis[axis].label = airFree(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } Index: axinsert.c =================================================================== RCS file: /cvsroot/teem/teem/src/unrrdu/axinsert.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** axinsert.c 7 Jan 2004 15:34:31 -0000 1.4 --- axinsert.c 13 Mar 2004 20:03:11 -0000 1.5 *************** *** 59,63 **** } if (strlen(label)) { ! AIR_FREE(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } --- 59,63 ---- } if (strlen(label)) { ! nout->axis[axis].label = airFree(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } Index: flotsam.c =================================================================== RCS file: /cvsroot/teem/teem/src/unrrdu/flotsam.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** flotsam.c 7 Jan 2004 15:34:31 -0000 1.16 --- flotsam.c 13 Mar 2004 20:03:11 -0000 1.17 *************** *** 324,328 **** file = _file; if (stdin != file) { ! AIR_FCLOSE(file); } return NULL; --- 324,328 ---- file = _file; if (stdin != file) { ! file = airFclose(file); } return NULL; Index: join.c =================================================================== RCS file: /cvsroot/teem/teem/src/unrrdu/join.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** join.c 7 Jan 2004 15:34:31 -0000 1.22 --- join.c 13 Mar 2004 20:03:11 -0000 1.23 *************** *** 81,85 **** } if (strlen(label)) { ! AIR_FREE(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } --- 81,85 ---- } if (strlen(label)) { ! nout->axis[axis].label = airFree(nout->axis[axis].label); nout->axis[axis].label = airStrdup(label); } Index: make.c =================================================================== RCS file: /cvsroot/teem/teem/src/unrrdu/make.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** make.c 7 Jan 2004 15:34:31 -0000 1.48 --- make.c 13 Mar 2004 20:03:11 -0000 1.49 *************** *** 58,74 **** if (nrrdLineSkip(nio)) { sprintf(err, "%s: couldn't skip lines", me); ! AIR_FCLOSE(nio->dataFile); biffMove(me, err, NRRD); return 1; } if (!nio->encoding->isCompression) { if (nrrdByteSkip(nrrd, nio)) { sprintf(err, "%s: couldn't skip bytes", me); ! AIR_FCLOSE(nio->dataFile); biffMove(me, err, NRRD); return 1; } } if (nio->encoding->read(nrrd, nio)) { sprintf(err, "%s: error reading data", me); ! AIR_FCLOSE(nio->dataFile); biffMove(me, err, NRRD); return 1; } ! AIR_FCLOSE(nio->dataFile); return 0; } --- 58,77 ---- if (nrrdLineSkip(nio)) { sprintf(err, "%s: couldn't skip lines", me); ! nio->dataFile = airFclose(nio->dataFile); ! biffMove(me, err, NRRD); return 1; } if (!nio->encoding->isCompression) { if (nrrdByteSkip(nrrd, nio)) { sprintf(err, "%s: couldn't skip bytes", me); ! nio->dataFile = airFclose(nio->dataFile); ! biffMove(me, err, NRRD); return 1; } } if (nio->encoding->read(nrrd, nio)) { sprintf(err, "%s: error reading data", me); ! nio->dataFile = airFclose(nio->dataFile); ! biffMove(me, err, NRRD); return 1; } ! nio->dataFile = airFclose(nio->dataFile); return 0; } |