[elj-commits] CVS: elj-2002/lib/ifs/eiffel/btrieve btrieve.e,1.5,1.6

[Uwe S. <us...@us...>]

Update of /cvsroot/elj/elj-2002/lib/ifs/eiffel/btrieve
In directory sc8-pr-cvs1:/tmp/cvs-serv15913

Modified Files:
	btrieve.e 
Log Message:
continued

Index: btrieve.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/btrieve/btrieve.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** btrieve.e	30 May 2002 04:45:00 -0000	1.5
--- btrieve.e	16 Dec 2002 14:52:57 -0000	1.6
***************
*** 23,28 ****
  			position_block_pointer := position_block.to_pointer
  
! 			key_buffer := key_buffer.calloc (255)
! 			key_buffer_pointer := key_buffer.to_pointer
  
  			create buffers.make
--- 23,28 ----
  			position_block_pointer := position_block.to_pointer
  
! 			create key_buffer.make (1, 255)
! 			key_buffer_pointer := key_buffer.to_external
  
  			create buffers.make
***************
*** 104,107 ****
--- 104,109 ----
  	data_array: ARRAY[CHARACTER]
  		-- current data_buffer, character wise
+ 	key_buffer: ARRAY[CHARACTER]
+ 		-- key data block
  	data_buffer: POINTER
  		-- pointer to current data_buffer
***************
*** 180,189 ****
  		do
  			from
! 				idx := 0
! 				key_buffer.clear_all (254)
  			until
! 				idx = a_path_and_file.count
  			loop
! 				key_buffer.put (a_path_and_file.item (idx + 1), idx)
  				idx := idx + 1
  			end -- loop
--- 182,191 ----
  		do
  			from
! 				idx := 1
! 				key_buffer.clear_all
  			until
! 				idx > a_path_and_file.count
  			loop
! 				key_buffer.put (a_path_and_file.item (idx), idx)
  				idx := idx + 1
  			end -- loop
***************
*** 347,356 ****
  			
  			from
! 				idx := 0
! 				key_buffer.clear_all (254)
  			until
! 				idx = a_path_and_file.count
  			loop
! 				key_buffer.put (a_path_and_file.item (idx + 1), idx)
  				idx := idx + 1
  			end -- loop
--- 349,358 ----
  			
  			from
! 				idx := 1
! 				key_buffer.clear_all
  			until
! 				idx > a_path_and_file.count
  			loop
! 				key_buffer.put (a_path_and_file.item (idx), idx)
  				idx := idx + 1
  			end -- loop
***************
*** 489,497 ****
  			from
  				idx := a_owner.lower
! 				key_buffer.clear_all (254)
  			until
  				idx > a_owner.upper
  			loop
! 				key_buffer.put (a_owner.item (idx), idx - a_owner.lower)
  				idx := idx + 1
  			end -- loop
--- 491,499 ----
  			from
  				idx := a_owner.lower
! 				key_buffer.clear_all
  			until
  				idx > a_owner.upper
  			loop
! 				key_buffer.put (a_owner.item (idx), idx - a_owner.lower + 1)
  				idx := idx + 1
  			end -- loop
***************
*** 637,642 ****
  			from
  				idx := a_values.lower
  			until
! 				idx > a_values.upper or else key = 254
  			loop
  				key_buffer.put (a_values.item (idx), key)
--- 639,645 ----
  			from
  				idx := a_values.lower
+ 				key := 1
  			until
! 				idx > a_values.upper or else key > 255
  			loop
  				key_buffer.put (a_values.item (idx), key)
***************
*** 678,683 ****
  	buffers: LINKED_LIST[ARRAY[CHARACTER]]
  		-- 'stack' of data buffers
- 	key_buffer: NATIVE_ARRAY[CHARACTER]
- 		-- file information block
  	key_buffer_pointer: POINTER
  		-- pointer to file information
--- 681,684 ----