[Teem-commit] teem/src/gage ctx.c,1.12,1.13 miscGage.c,1.10,1.11 pvl.c,1.11,1.12 update.c,1.12,1.13

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/gage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26582/gage

Modified Files:
	ctx.c miscGage.c pvl.c update.c 
Log Message:
killed off AIR_FREE and AIR_FCLOSE macros- they were just way too cute for their own good

Index: ctx.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/ctx.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ctx.c	16 Jan 2004 17:35:12 -0000	1.12
--- ctx.c	13 Mar 2004 20:03:09 -0000	1.13
***************
*** 78,86 ****
      }
      ctx->shape = gageShapeNix(ctx->shape);
!     AIR_FREE(ctx->fw);
!     AIR_FREE(ctx->fsl);
!     AIR_FREE(ctx->off);
    }
!   AIR_FREE(ctx);
    return NULL;
  }
--- 78,86 ----
      }
      ctx->shape = gageShapeNix(ctx->shape);
!     ctx->fw = airFree(ctx->fw);
!     ctx->fsl = airFree(ctx->fsl);
!     ctx->off = airFree(ctx->off);
    }
!   ctx = airFree(ctx);
    return NULL;
  }

Index: miscGage.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/miscGage.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** miscGage.c	13 Feb 2004 22:56:15 -0000	1.10
--- miscGage.c	13 Mar 2004 20:03:09 -0000	1.11
***************
*** 231,235 ****
  
    if (isp) {
!     AIR_FREE(isp);
    }
    return NULL;
--- 231,235 ----
  
    if (isp) {
!     isp = airFree(isp);
    }
    return NULL;

Index: pvl.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/pvl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pvl.c	19 Feb 2004 03:50:02 -0000	1.11
--- pvl.c	13 Mar 2004 20:03:09 -0000	1.12
***************
*** 155,167 ****
  gagePerVolumeNix (gagePerVolume *pvl) {
  
!   AIR_FREE(pvl->iv3);
!   AIR_FREE(pvl->iv2);
!   AIR_FREE(pvl->iv1);
    if (!pvl->thisIsACopy && pvl->nixer) {
      pvl->nixer(pvl->npad, pvl->kind, pvl);
    }
!   AIR_FREE(pvl->answer);
!   AIR_FREE(pvl->directAnswer);
!   AIR_FREE(pvl);
    return NULL;
  }
--- 155,167 ----
  gagePerVolumeNix (gagePerVolume *pvl) {
  
!   pvl->iv3 = airFree(pvl->iv3);
!   pvl->iv2 = airFree(pvl->iv2);
!   pvl->iv1 = airFree(pvl->iv1);
    if (!pvl->thisIsACopy && pvl->nixer) {
      pvl->nixer(pvl->npad, pvl->kind, pvl);
    }
!   pvl->answer = airFree(pvl->answer);
!   pvl->directAnswer = airFree(pvl->directAnswer);
!   pvl = airFree(pvl);
    return NULL;
  }

Index: update.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/update.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** update.c	13 Feb 2004 22:56:15 -0000	1.12
--- update.c	13 Mar 2004 20:03:09 -0000	1.13
***************
*** 336,342 ****
    if (ctx->verbose) fprintf(stderr, "%s: hello\n", me);
    fd = GAGE_FD(ctx);
!   AIR_FREE(ctx->fsl);
!   AIR_FREE(ctx->fw);
!   AIR_FREE(ctx->off);
    ctx->fsl = (gage_t *)calloc(fd*3, sizeof(gage_t));
    ctx->fw = (gage_t *)calloc(fd*3*GAGE_KERNEL_NUM, sizeof(gage_t));
--- 336,342 ----
    if (ctx->verbose) fprintf(stderr, "%s: hello\n", me);
    fd = GAGE_FD(ctx);
!   ctx->fsl = airFree(ctx->fsl);
!   ctx->fw = airFree(ctx->fw);
!   ctx->off = airFree(ctx->off);
    ctx->fsl = (gage_t *)calloc(fd*3, sizeof(gage_t));
    ctx->fw = (gage_t *)calloc(fd*3*GAGE_KERNEL_NUM, sizeof(gage_t));
***************
*** 348,354 ****
    for (i=0; i<ctx->numPvl; i++) {
      pvl = ctx->pvl[i];
!     AIR_FREE(pvl->iv3);
!     AIR_FREE(pvl->iv2);
!     AIR_FREE(pvl->iv1);
      pvl->iv3 = (gage_t *)calloc(fd*fd*fd*pvl->kind->valLen, sizeof(gage_t));
      pvl->iv2 = (gage_t *)calloc(fd*fd*pvl->kind->valLen, sizeof(gage_t));
--- 348,354 ----
    for (i=0; i<ctx->numPvl; i++) {
      pvl = ctx->pvl[i];
!     pvl->iv3 = airFree(pvl->iv3);
!     pvl->iv2 = airFree(pvl->iv2);
!     pvl->iv1 = airFree(pvl->iv1);
      pvl->iv3 = (gage_t *)calloc(fd*fd*fd*pvl->kind->valLen, sizeof(gage_t));
      pvl->iv2 = (gage_t *)calloc(fd*fd*pvl->kind->valLen, sizeof(gage_t));