[frontierkernel-commits] Frontier/Common/source stringverbs.c,1.6,1.7

[Seth D. <set...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083

Modified Files:
	stringverbs.c 
Log Message:
Minor updates to midfunc and deletefunc. midfunc is marginally faster, and the coding style for both is now more consistent with the rest of the code.

Index: stringverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/stringverbs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** stringverbs.c	6 Dec 2004 00:51:12 -0000	1.6
--- stringverbs.c	7 Dec 2004 17:08:01 -0000	1.7
***************
*** 1433,1447 ****
  			
  			if (!newhandle (lenbefore + lenafter, &x))
! 				return false;
  			
  			ixbefore = 0;
  			if (lenbefore > 0)
  				if (!loadfromhandle (hstring, &ixbefore, lenbefore, *x))
! 					return false;
  			
  			ixbefore += ctdelete;
  			if (lenafter > 0)
  				if (!loadfromhandle (hstring, &ixbefore, lenafter, &((*x) [lenbefore]) ))
! 					return false;
  			
  			return (setheapvalue (x, stringvaluetype, v));
--- 1433,1447 ----
  			
  			if (!newhandle (lenbefore + lenafter, &x))
! 				return (false);
  			
  			ixbefore = 0;
  			if (lenbefore > 0)
  				if (!loadfromhandle (hstring, &ixbefore, lenbefore, *x))
! 					return (false);
  			
  			ixbefore += ctdelete;
  			if (lenafter > 0)
  				if (!loadfromhandle (hstring, &ixbefore, lenafter, &((*x) [lenbefore]) ))
! 					return (false);
  			
  			return (setheapvalue (x, stringvaluetype, v));
***************
*** 1574,1578 ****
  			Handle x;
  			long ix;
! 			long len;
  			
  			
--- 1574,1578 ----
  			Handle x;
  			long ix;
! 			long hlen, newlen;
  			
  			
***************
*** 1582,1586 ****
  			flnextparamislast = true;
  			
! 			if (!getlongvalue (hp1, 3, &len)) 
  				return (false);
  			
--- 1582,1586 ----
  			flnextparamislast = true;
  			
! 			if (!getlongvalue (hp1, 3, &newlen)) 
  				return (false);
  			
***************
*** 1591,1603 ****
  				--ix; /*convert to zero-base*/
  			
! 			len = min (len, gethandlesize (hstring) - ix);
  			
! 			if (len > 0) {
! 				if (!loadfromhandletohandle (hstring, &ix, len, false, &x))
! 					if (!newemptyhandle (&x))
! 						return (false);
  				}
  			else if (!newemptyhandle (&x))
! 				return false;
  			
  			return (setheapvalue (x, stringvaluetype, v));
--- 1591,1606 ----
  				--ix; /*convert to zero-base*/
  			
! 			hlen = gethandlesize (hstring);
! 			newlen = min (newlen, hlen - ix);
  			
! 			
! 			if (newlen > 0) {
! 				if (!newhandle (newlen, &x))
! 					return (false);
! 				if (!loadfromhandle (hstring, &ix, newlen, *x))
! 					return (false);
  				}
  			else if (!newemptyhandle (&x))
! 				return (false);
  			
  			return (setheapvalue (x, stringvaluetype, v));