[Ext2resize-cvs] ext2resize/src ext2_inode_relocator.c,1.16,1.17

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/ext2resize/ext2resize/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12168

Modified Files:
	ext2_inode_relocator.c 
Log Message:
some s/foobar/foo_bar renamings in struct ext2_inode_relocator_state


Index: ext2_inode_relocator.c
===================================================================
RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_inode_relocator.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ext2_inode_relocator.c	30 Sep 2004 14:01:41 -0000	1.16
--- ext2_inode_relocator.c	17 Feb 2006 05:31:25 -0000	1.17
***************
*** 49,54 ****
  struct ext2_inode_relocator_state
  {
! 	int			 usedentries;
! 	int			 resolvedentries;
  	struct ext2_inode_entry	*inode;
  	struct ext2_reference	*last;
--- 49,54 ----
  struct ext2_inode_relocator_state
  {
! 	int			 used_entries;
! 	int			 resolved_entries;
  	struct ext2_inode_entry	*inode;
  	struct ext2_reference	*last;
***************
*** 68,72 ****
  	blk_t			 tval;
  
! 	max_e = state->usedentries - 1;
  	min_e = 0;
  	retv = NULL;
--- 68,72 ----
  	blk_t			 tval;
  
! 	max_e = state->used_entries - 1;
  	min_e = 0;
  	retv = NULL;
***************
*** 119,123 ****
  
  	if (i == ent->numreferences - 1)
! 		state->resolvedentries++;
  
  	ent->ref[i].block = blockno;
--- 119,123 ----
  
  	if (i == ent->numreferences - 1)
! 		state->resolved_entries++;
  
  	ent->ref[i].block = blockno;
***************
*** 240,244 ****
  }
  
! static int doscangroup(struct ext2_fs *fs,
  		       struct ext2_inode_relocator_state *state, int group)
  {
--- 240,244 ----
  }
  
! static int do_scan_group(struct ext2_fs *fs,
  		       struct ext2_inode_relocator_state *state, int group)
  {
***************
*** 260,264 ****
  			}
  
! 			if (state->resolvedentries == state->usedentries)
  				break;
  		}
--- 260,264 ----
  			}
  
! 			if (state->resolved_entries == state->used_entries)
  				break;
  		}
***************
*** 268,289 ****
  	if (fs->flags & FL_VERBOSE)
  		printf("%i/%i inodes resolved\r",
! 			state->resolvedentries, state->usedentries);
  
  	return 1;
  }
  
! static int doscan(struct ext2_fs *fs, struct ext2_inode_relocator_state *state)
  {
  	int i;
  
! 	if (!doscangroup(fs, state, 0))
  		return 0;
  
! 	if (state->resolvedentries != state->usedentries)
  		for (i = fs->numgroups - 1; i > 0; i--) {
! 			if (!doscangroup(fs, state, i))
  				return 0;
  
! 			if (state->resolvedentries == state->usedentries)
  				break;
  		}
--- 268,289 ----
  	if (fs->flags & FL_VERBOSE)
  		printf("%i/%i inodes resolved\r",
! 			state->resolved_entries, state->used_entries);
  
  	return 1;
  }
  
! static int do_scan(struct ext2_fs *fs, struct ext2_inode_relocator_state *state)
  {
  	int i;
  
! 	if (!do_scan_group(fs, state, 0))
  		return 0;
  
! 	if (state->resolved_entries != state->used_entries)
  		for (i = fs->numgroups - 1; i > 0; i--) {
! 			if (!do_scan_group(fs, state, i))
  				return 0;
  
! 			if (state->resolved_entries == state->used_entries)
  				break;
  		}
***************
*** 306,310 ****
  	int i;
  
! 	for (i = 0; i < state->usedentries; i++) {
  		struct ext2_inode inode;
  		struct ext2_inode_entry *entry;
--- 306,310 ----
  	int i;
  
! 	for (i = 0; i < state->used_entries; i++) {
  		struct ext2_inode inode;
  		struct ext2_inode_entry *entry;
***************
*** 331,335 ****
  	int i;
  
! 	for (i = 0; i < state->usedentries; i++) {
  		struct ext2_inode_entry *entry;
  
--- 331,335 ----
  	int i;
  
! 	for (i = 0; i < state->used_entries; i++) {
  		struct ext2_inode_entry *entry;
  
***************
*** 350,354 ****
  	static int	numerrors = 0;
  
! 	for (i = 0; i < state->usedentries; i++) {
  		struct ext2_inode_entry *entry;
  		int			 j;
--- 350,354 ----
  	static int	numerrors = 0;
  
! 	for (i = 0; i < state->used_entries; i++) {
  		struct ext2_inode_entry *entry;
  		int			 j;
***************
*** 428,432 ****
  					state->inode[ptr++].dest = offset + j;
  
! 					if (ptr == state->usedentries) {
  						ext2_brelse(bh, 0);
  						return 1;
--- 428,432 ----
  					state->inode[ptr++].dest = offset + j;
  
! 					if (ptr == state->used_entries) {
  						ext2_brelse(bh, 0);
  						return 1;
***************
*** 446,453 ****
  				      struct ext2_inode_relocator_state *state)
  {
! 	if (!state->usedentries)
  		return 1;
  
! 	if (!doscan(fs, state))
  		return 0;
  
--- 446,453 ----
  				      struct ext2_inode_relocator_state *state)
  {
! 	if (!state->used_entries)
  		return 1;
  
! 	if (!do_scan(fs, state))
  		return 0;
  
***************
*** 459,464 ****
  	ext2_inode_relocator_finish(fs, state);
  
! 	state->usedentries = 0;
! 	state->resolvedentries = 0;
  	state->last = (struct ext2_reference *)fs->relocator_pool_end;
  
--- 459,464 ----
  	ext2_inode_relocator_finish(fs, state);
  
! 	state->used_entries = 0;
! 	state->resolved_entries = 0;
  	state->last = (struct ext2_reference *)fs->relocator_pool_end;
  
***************
*** 481,485 ****
  	ext2_read_inode(fs, ino, &inode);
  
! 	adv = state->inode + state->usedentries + 1;
  	rec = state->last - inode.i_links_count;
  
--- 481,485 ----
  	ext2_read_inode(fs, ino, &inode);
  
! 	adv = state->inode + state->used_entries + 1;
  	rec = state->last - inode.i_links_count;
  
***************
*** 489,493 ****
  	state->last -= inode.i_links_count;
  
! 	ent = &state->inode[state->usedentries];
  	ent->ino = ino;
  	ent->dest = 0;
--- 489,493 ----
  	state->last -= inode.i_links_count;
  
! 	ent = &state->inode[state->used_entries];
  	ent->ino = ino;
  	ent->dest = 0;
***************
*** 500,504 ****
  	}
  
! 	state->usedentries++;
  
  	return 1;
--- 500,504 ----
  	}
  
! 	state->used_entries++;
  
  	return 1;
***************
*** 514,519 ****
  		printf("%s\n", __FUNCTION__);
  
! 	state.usedentries = 0;
! 	state.resolvedentries = 0;
  	state.inode = (struct ext2_inode_entry *)fs->relocator_pool;
  	state.last = (struct ext2_reference *)fs->relocator_pool_end;
--- 514,519 ----
  		printf("%s\n", __FUNCTION__);
  
! 	state.used_entries = 0;
! 	state.resolved_entries = 0;
  	state.inode = (struct ext2_inode_entry *)fs->relocator_pool;
  	state.last = (struct ext2_reference *)fs->relocator_pool_end;