[Guardsoft-cvs] libaif calc.c,1.39,1.40 cmp.c,1.47,1.48 conv.c,1.53,1.54

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/guardsoft/libaif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22376

Modified Files:
	calc.c cmp.c conv.c 
Log Message:
remove use of TypeToFDS

Index: cmp.c
===================================================================
RCS file: /cvsroot/guardsoft/libaif/cmp.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** cmp.c	9 Apr 2004 22:23:28 -0000	1.47
--- cmp.c	24 May 2005 23:58:48 -0000	1.48
***************
*** 1504,1508 ****
  
  				if ( *rf == NULL )
! 					*rf = strdup(TypeToFDS(AIF_BOOLEAN));
  
  				*d1 += bytes1;
--- 1504,1508 ----
  
  				if ( *rf == NULL )
! 					*rf = strdup(AIF_BOOLEAN_TYPE());
  
  				*d1 += bytes1;
***************
*** 2222,2226 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_STRING));
  
  		return 0;
--- 2222,2226 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_STRING_TYPE());
  
  		return 0;

Index: calc.c
===================================================================
RCS file: /cvsroot/guardsoft/libaif/calc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** calc.c	31 Jan 2004 16:24:27 -0000	1.39
--- calc.c	24 May 2005 23:58:45 -0000	1.40
***************
*** 589,593 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, MAX(bytes1, bytes2)));
  			else
  			{
--- 589,593 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, MAX(bytes1, bytes2)));
  			else
  			{
***************
*** 629,633 ****
  
  			if ( *rf == NULL ) 
! 				*rf = strdup(TypeToFDS(AIF_FLOATING, MAX(bytes2, bytes3)));
  			else
  			{
--- 629,633 ----
  
  			if ( *rf == NULL ) 
! 				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
  			else
  			{
***************
*** 682,686 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 
  					FDSIsSigned(*f1) || FDSIsSigned(*f2),
  					MAX(bytes1, bytes2)));
--- 682,686 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(
  					FDSIsSigned(*f1) || FDSIsSigned(*f2),
  					MAX(bytes1, bytes2)));
***************
*** 707,711 ****
  
  			if ( *rf == NULL ) 
! 				*rf = strdup(TypeToFDS(AIF_FLOATING, MAX(bytes2, bytes3)));
  
  			_aif_free(d3);
--- 707,711 ----
  
  			if ( *rf == NULL ) 
! 				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
  
  			_aif_free(d3);
***************
*** 725,729 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  			return 0;
--- 725,729 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  			return 0;
***************
*** 759,763 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_FLOATING, MAX(bytes2, bytes3)));
  
  			_aif_free(d3);
--- 759,763 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
  
  			_aif_free(d3);
***************
*** 778,782 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_FLOATING, MAX(bytes1, bytes2)));
  
  			_fds_advance(f1);
--- 778,782 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes1, bytes2)));
  
  			_fds_advance(f1);
***************
*** 794,798 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  			return 0;
--- 794,798 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  			return 0;
***************
*** 815,819 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_BOOLEAN));
  
  			*d1 += bytes1;
--- 815,819 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_BOOLEAN_TYPE());
  
  			*d1 += bytes1;
***************
*** 845,849 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER,
  						FDSIsSigned(*f2),
  						MAX(bytes1, bytes2)));
--- 845,849 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(
  						FDSIsSigned(*f2),
  						MAX(bytes1, bytes2)));
***************
*** 859,863 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_CHARACTER));
  
  			*d1 += bytes1;
--- 859,863 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_CHARACTER_TYPE());
  
  			*d1 += bytes1;
***************
*** 878,882 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  			return 0;
--- 878,882 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  			return 0;
***************
*** 909,913 ****
  
  					if ( *rf == NULL )
! 						*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  					return 0;
--- 909,913 ----
  
  					if ( *rf == NULL )
! 						*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  					return 0;
***************
*** 1031,1035 ****
  
  				if ( *rf == NULL )
! 					*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  				return 0;
--- 1031,1035 ----
  
  				if ( *rf == NULL )
! 					*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  				return 0;
***************
*** 1382,1386 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_STRING));
  
  		return 0;
--- 1382,1386 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_STRING_TYPE());
  
  		return 0;
***************
*** 1397,1401 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  			return 0;
--- 1397,1401 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  			return 0;
***************
*** 1411,1415 ****
  
  			if ( *rf == NULL )
! 				*rf = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  			return 0;
--- 1411,1415 ----
  
  			if ( *rf == NULL )
! 				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  			return 0;
***************
*** 1444,1448 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_BOOLEAN));
  
  		if ( _aif_unary_op_bool(op, rd, *data, bytes) < 0 )
--- 1444,1448 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_BOOLEAN_TYPE());
  
  		if ( _aif_unary_op_bool(op, rd, *data, bytes) < 0 )
***************
*** 1457,1461 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_INTEGER, 1, bytes));
  		else
  		{
--- 1457,1461 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_INTEGER_TYPE(1, bytes));
  		else
  		{
***************
*** 1487,1491 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_INTEGER, FDSIsSigned(*fds), bytes));
  		_fds_advance(fds);
  
--- 1487,1491 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_INTEGER_TYPE(FDSIsSigned(*fds), bytes));
  		_fds_advance(fds);
  
***************
*** 1501,1505 ****
  
  		if ( *rf == NULL )
! 			*rf = strdup(TypeToFDS(AIF_FLOATING, bytes));
  
  		if ( _aif_unary_op_float(op, rd, *data, bytes) < 0 )
--- 1501,1505 ----
  
  		if ( *rf == NULL )
! 			*rf = strdup(AIF_FLOATING_TYPE(bytes));
  
  		if ( _aif_unary_op_float(op, rd, *data, bytes) < 0 )

Index: conv.c
===================================================================
RCS file: /cvsroot/guardsoft/libaif/conv.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** conv.c	22 May 2005 15:40:57 -0000	1.53
--- conv.c	24 May 2005 23:58:48 -0000	1.54
***************
*** 213,217 ****
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_NAME, name, AIF_FORMAT(oldAIF)));
  	AIF_DATA(a) = _aif_alloc(AIF_LEN(oldAIF));
  	memcpy(AIF_DATA(a), AIF_DATA(oldAIF), AIF_LEN(oldAIF));
--- 213,217 ----
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(AIF_NAME_TYPE(name, AIF_FORMAT(oldAIF)));
  	AIF_DATA(a) = _aif_alloc(AIF_LEN(oldAIF));
  	memcpy(AIF_DATA(a), AIF_DATA(oldAIF), AIF_LEN(oldAIF));
***************
*** 245,249 ****
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_REFERENCE, name));
  	AIF_LEN(a) = 0;
  	
--- 245,249 ----
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(AIF_REFERENCE_TYPE(name));
  	AIF_LEN(a) = 0;
  	
***************
*** 274,279 ****
  		*/
  		sscanf(oldFormat, "%%%d/", &name);
! 		fmt = strdup(TypeToFDS(AIF_REFERENCE, name));
! 		AIF_FORMAT(a) = strdup(TypeToFDS(AIF_POINTER, fmt));
  		_aif_free(fmt);
  	}
--- 274,279 ----
  		*/
  		sscanf(oldFormat, "%%%d/", &name);
! 		fmt = strdup(AIF_REFERENCE_TYPE(name));
! 		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(fmt));
  		_aif_free(fmt);
  	}
***************
*** 283,287 ****
  		** repeat the format
  		*/
! 		AIF_FORMAT(a) = strdup(TypeToFDS(AIF_POINTER, oldFormat));
  	}
  
--- 283,287 ----
  		** repeat the format
  		*/
! 		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(oldFormat));
  	}
  
***************
*** 303,307 ****
  	sscanf(fmt, "%%%d/", &name);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_POINTER, AIF_FORMAT(i)));
  
  	*(AIF_DATA(a)) = (char) AIF_PTR_NAME;
--- 303,307 ----
  	sscanf(fmt, "%%%d/", &name);
  
! 	AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(AIF_FORMAT(i)));
  
  	*(AIF_DATA(a)) = (char) AIF_PTR_NAME;
***************
*** 333,338 ****
  		*/
  		sscanf(oldFormat, "%%%d/", &name);
! 		fmt = strdup(TypeToFDS(AIF_REFERENCE, name));
! 		AIF_FORMAT(a) = strdup(TypeToFDS(AIF_POINTER, fmt));
  		_aif_free(fmt);
  	}
--- 333,338 ----
  		*/
  		sscanf(oldFormat, "%%%d/", &name);
! 		fmt = strdup(AIF_REFERENCE_TYPE(name));
! 		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(fmt));
  		_aif_free(fmt);
  	}
***************
*** 355,359 ****
  	a = NewAIF(0, AIF_LEN(i)+1);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_POINTER, AIF_FORMAT(i)));
  
  	if ( _pointer_to_aif(&AIF_DATA(a), i) < 0 )
--- 355,359 ----
  	a = NewAIF(0, AIF_LEN(i)+1);
  
! 	AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(AIF_FORMAT(i)));
  
  	if ( _pointer_to_aif(&AIF_DATA(a), i) < 0 )
***************
*** 388,392 ****
  	a = NewAIF(0, length+2);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_STRING));
  
  	(AIF_DATA(a))[0] = (length >> 8) & 0xff;
--- 388,392 ----
  	a = NewAIF(0, length+2);
  
! 	AIF_FORMAT(a) = strdup(AIF_STRING_TYPE());
  
  	(AIF_DATA(a))[0] = (length >> 8) & 0xff;
***************
*** 411,415 ****
  	a = NewAIF(0, size);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_BOOLEAN));
  
  	if ( b )
--- 411,415 ----
  	a = NewAIF(0, size);
  
! 	AIF_FORMAT(a) = strdup(AIF_BOOLEAN_TYPE());
  
  	if ( b )
***************
*** 431,435 ****
  	a = NewAIF(0, sizeof(char));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_CHARACTER));
  
  	if ( _char_to_aif(&AIF_DATA(a), c) < 0 )
--- 431,435 ----
  	a = NewAIF(0, sizeof(char));
  
! 	AIF_FORMAT(a) = strdup(AIF_CHARACTER_TYPE());
  
  	if ( _char_to_aif(&AIF_DATA(a), c) < 0 )
***************
*** 452,456 ****
  	a = NewAIF(0, sizeof(int));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(int)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(int), (AIFLONGEST)i) < 0 )
--- 452,456 ----
  	a = NewAIF(0, sizeof(int));
  
! 	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(int), (AIFLONGEST)i) < 0 )
***************
*** 473,477 ****
  	a = NewAIF(0, sizeof(unsigned int));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_INTEGER, 0, sizeof(unsigned int)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned int), (AIFLONGEST)i) < 0 )
--- 473,477 ----
  	a = NewAIF(0, sizeof(unsigned int));
  
! 	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(0, sizeof(unsigned int)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned int), (AIFLONGEST)i) < 0 )
***************
*** 494,498 ****
  	a = NewAIF(0, sizeof(AIFLONGEST));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_INTEGER, 1, sizeof(AIFLONGEST)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(AIFLONGEST), i) < 0 )
--- 494,498 ----
  	a = NewAIF(0, sizeof(AIFLONGEST));
  
! 	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(AIFLONGEST)));
  
  	if ( _longest_to_aif(&AIF_DATA(a), sizeof(AIFLONGEST), i) < 0 )
***************
*** 547,551 ****
  	a = NewAIF(0, sizeof(float));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_FLOATING, sizeof(float)));
  
  	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(float), (AIFDOUBLEST)f) < 0 )
--- 547,551 ----
  	a = NewAIF(0, sizeof(float));
  
! 	AIF_FORMAT(a) = strdup(AIF_FLOATING_TYPE(sizeof(float)));
  
  	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(float), (AIFDOUBLEST)f) < 0 )
***************
*** 565,569 ****
  	a = NewAIF(0, sizeof(double));
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_FLOATING, sizeof(double)));
  
  	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(double), (AIFDOUBLEST)f) < 0 )
--- 565,569 ----
  	a = NewAIF(0, sizeof(double));
  
! 	AIF_FORMAT(a) = strdup(AIF_FLOATING_TYPE(sizeof(double)));
  
  	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(double), (AIFDOUBLEST)f) < 0 )
***************
*** 576,580 ****
  ** Convert an array to AIF.
  **
! ** AIF *ArrayToAIF(int rank, int *min, int *max, char *data, char *btype)
  **
  ** - rank is the rank of the array
--- 576,580 ----
  ** Convert an array to AIF.
  **
! ** AIF *ArrayToAIF(int rank, int *min, int *max, char *data, int len, char *btype)
  **
  ** - rank is the rank of the array
***************
*** 600,609 ****
  
  	btype = strdup(btype);
! 	itype = strdup(TypeToFDS(AIF_INTEGER, 0, sizeof(int)));
  
  	for ( i = rank - 1  ; i >= 0 ; i-- )
  	{
! 		rtype = strdup(TypeToFDS(AIF_RANGE, min[i], max[i], itype));
! 		fds = strdup(TypeToFDS(AIF_ARRAY, rtype, btype));
  
  		_aif_free(rtype);
--- 600,609 ----
  
  	btype = strdup(btype);
! 	itype = strdup(AIF_INTEGER_TYPE(0, sizeof(int)));
  
  	for ( i = rank - 1  ; i >= 0 ; i-- )
  	{
! 		rtype = strdup(AIF_RANGE_TYPE(min[i], max[i], itype));
! 		fds = strdup(AIF_ARRAY_TYPE(rtype, btype));
  
  		_aif_free(rtype);
***************
*** 636,640 ****
          a = NewAIF(0, sizeof(int));
  
!         AIF_FORMAT(a) = strdup(TypeToFDS(AIF_ENUM, 1));
  
          ResetAIFError();
--- 636,640 ----
          a = NewAIF(0, sizeof(int));
  
!         AIF_FORMAT(a) = strdup(AIF_ENUM_TYPE(1));
  
          ResetAIFError();
***************
*** 729,733 ****
          a = NewAIF(0, 0);
  
!         AIF_FORMAT(a) = strdup(TypeToFDS(AIF_UNION));
  
          ResetAIFError();
--- 729,733 ----
          a = NewAIF(0, 0);
  
!         AIF_FORMAT(a) = strdup(AIF_UNION_TYPE());
  
          ResetAIFError();
***************
*** 831,835 ****
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_STRUCT));
  
  	ResetAIFError();
--- 831,835 ----
  	a = NewAIF(0, 0);
  
! 	AIF_FORMAT(a) = strdup(AIF_STRUCT_TYPE());
  
  	ResetAIFError();
***************
*** 1272,1276 ****
  	a = NewAIF(0, len);
  
! 	AIF_FORMAT(a) = strdup(TypeToFDS(AIF_VOID, len));
  
  	if ( data != NULL && len > 0 )
--- 1272,1276 ----
  	a = NewAIF(0, len);
  
! 	AIF_FORMAT(a) = strdup(AIF_VOID_TYPE(len));
  
  	if ( data != NULL && len > 0 )
***************
*** 1381,1385 ****
  			na = NewAIF(0, tlen);
  
! 			AIF_FORMAT(na) = strdup(TypeToFDS(AIF_FLOATING, tlen));
  
  			/*
--- 1381,1385 ----
  			na = NewAIF(0, tlen);
  
! 			AIF_FORMAT(na) = strdup(AIF_FLOATING_TYPE(tlen));
  
  			/*