[Teem-commit] teem/src/hest methodsHest.c,1.9,1.10 parseHest.c,1.13,1.14

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

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

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

Index: methodsHest.c
===================================================================
RCS file: /cvsroot/teem/teem/src/hest/methodsHest.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** methodsHest.c	7 Jan 2004 15:34:29 -0000	1.9
--- methodsHest.c	13 Mar 2004 20:03:09 -0000	1.10
***************
*** 55,59 ****
  hestParmFree(hestParm *parm) {
  
!   AIR_FREE(parm);
    return NULL;
  }
--- 55,59 ----
  hestParmFree(hestParm *parm) {
  
!   parm = airFree(parm);
    return NULL;
  }
***************
*** 149,156 ****
  _hestOptFree(hestOpt *opt) {
    
!   AIR_FREE(opt->flag);
!   AIR_FREE(opt->name);
!   AIR_FREE(opt->dflt);
!   AIR_FREE(opt->info);
    return;
  }
--- 149,156 ----
  _hestOptFree(hestOpt *opt) {
    
!   opt->flag = airFree(opt->flag);
!   opt->name = airFree(opt->name);
!   opt->dflt = airFree(opt->dflt);
!   opt->info = airFree(opt->info);
    return;
  }

Index: parseHest.c
===================================================================
RCS file: /cvsroot/teem/teem/src/hest/parseHest.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** parseHest.c	7 Jan 2004 15:34:29 -0000	1.13
--- parseHest.c	13 Mar 2004 20:03:09 -0000	1.14
***************
*** 441,445 ****
      if (appr[flag]) {
        airMopSub(pmop, prms[flag], airFree);
!       AIR_FREE(prms[flag]);
      }
      prms[flag] = _hestExtract(argcP, argv, a, nprm[flag]);
--- 441,445 ----
      if (appr[flag]) {
        airMopSub(pmop, prms[flag], airFree);
!       prms[flag] = airFree(prms[flag]);
      }
      prms[flag] = _hestExtract(argcP, argv, a, nprm[flag]);
***************
*** 641,645 ****
        tmpS = airStrdup(prms[op]);
        nprm[op] = airStrntok(tmpS, " ");
!       AIR_FREE(tmpS);
        /* printf("!%s: nprm[%d] in default = %d\n", me, op, nprm[op]); */
        if (opt[op].min < _hestMax(opt[op].max)) {
--- 641,645 ----
        tmpS = airStrdup(prms[op]);
        nprm[op] = airStrntok(tmpS, " ");
!       tmpS = airFree(tmpS);
        /* printf("!%s: nprm[%d] in default = %d\n", me, op, nprm[op]); */
        if (opt[op].min < _hestMax(opt[op].max)) {
***************
*** 874,878 ****
  	  if (opt[op].flag && 1 == _hestCase(opt, udflt, nprm, appr, op)) {
  	    /* we just parsed the default, but now we want to "invert" it */
! 	    AIR_FREE(*((char**)vP));
  	    opt[op].alloc = 0;
  	  }
--- 874,878 ----
  	  if (opt[op].flag && 1 == _hestCase(opt, udflt, nprm, appr, op)) {
  	    /* we just parsed the default, but now we want to "invert" it */
! 	    *((char**)vP) = airFree(*((char**)vP));
  	    opt[op].alloc = 0;
  	  }
***************
*** 1192,1196 ****
      case 1:
        if (airTypeOther != opt[op].type) {
! 	AIR_FREE(*vP);
        }
        else {
--- 1192,1196 ----
      case 1:
        if (airTypeOther != opt[op].type) {
! 	*vP = airFree(*vP);
        }
        else {
***************
*** 1202,1206 ****
  	}
  	else {
! 	  AIR_FREE(*vP);
  	}
        }
--- 1202,1206 ----
  	}
  	else {
! 	  *vP = airFree(*vP);
  	}
        }
***************
*** 1209,1213 ****
        if (airTypeString == opt[op].type) {
  	for (i=0; i<=opt[op].min-1; i++) {
! 	  AIR_FREE(str[i]);
  	}
        }
--- 1209,1213 ----
        if (airTypeString == opt[op].type) {
  	for (i=0; i<=opt[op].min-1; i++) {
! 	  str[i] = airFree(str[i]);
  	}
        }
***************
*** 1221,1227 ****
        if (airTypeString == opt[op].type) {
  	for (i=0; i<=*(opt[op].sawP)-1; i++) {
! 	  AIR_FREE((*strP)[i]);
  	}
! 	AIR_FREE(*strP);
        }
        else {
--- 1221,1227 ----
        if (airTypeString == opt[op].type) {
  	for (i=0; i<=*(opt[op].sawP)-1; i++) {
! 	  (*strP)[i] = airFree((*strP)[i]);
  	}
! 	*strP = airFree(*strP);
        }
        else {
***************
*** 1229,1233 ****
  	  (*vAP)[i] = opt[op].CB->destroy((*vAP)[i]);
  	}
! 	AIR_FREE(*vAP);
        }
        break;
--- 1229,1233 ----
  	  (*vAP)[i] = opt[op].CB->destroy((*vAP)[i]);
  	}
! 	*vAP = airFree(*vAP);
        }
        break;