[Teem-commit] teem/src/bin mrender.c,1.32,1.33 talkweb.c,1.7,1.8

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

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

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

Index: mrender.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mrender.c	19 Feb 2004 11:15:13 -0000	1.32
--- mrender.c	13 Mar 2004 20:03:08 -0000	1.33
***************
*** 125,129 ****
    if (uu) {
      airMopOkay(uu->mrmop);
!     AIR_FREE(uu);
    }
    return NULL;
--- 125,129 ----
    if (uu) {
      airMopOkay(uu->mrmop);
!     uu = airFree(uu);
    }
    return NULL;
***************
*** 301,305 ****
  mrendThreadEnd(mrendThread *tt, mrendRender *rr, mrendUser *uu) {
    
!   AIR_FREE(tt->val);
  
    return 0;
--- 301,305 ----
  mrendThreadEnd(mrendThread *tt, mrendRender *rr, mrendUser *uu) {
    
!   tt->val = airFree(tt->val);
  
    return 0;
***************
*** 333,337 ****
    newLen = AIR_ROUNDUP(rayLen/tt->rayStep) + 1;
    if (!tt->val || newLen > tt->valLen) {
!     AIR_FREE(tt->val);
      tt->valLen = newLen;
      tt->val = (float*)calloc(newLen, sizeof(float));
--- 333,337 ----
    newLen = AIR_ROUNDUP(rayLen/tt->rayStep) + 1;
    if (!tt->val || newLen > tt->valLen) {
!     tt->val = airFree(tt->val);
      tt->valLen = newLen;
      tt->val = (float*)calloc(newLen, sizeof(float));

Index: talkweb.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/talkweb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** talkweb.c	7 Jan 2004 15:34:28 -0000	1.7
--- talkweb.c	13 Mar 2004 20:03:08 -0000	1.8
***************
*** 78,85 ****
  tkwbSlideNix(tkwbSlide *slide) {
  
!   AIR_FREE(slide->title);
!   AIR_FREE(slide->image);
!   AIR_FREE(slide->text);
!   AIR_FREE(slide);
    return NULL;
  }
--- 78,85 ----
  tkwbSlideNix(tkwbSlide *slide) {
  
!   slide->title = airFree(slide->title);
!   slide->image = airFree(slide->image);
!   slide->text = airFree(slide->text);
!   slide = airFree(slide);
    return NULL;
  }