evms-cvs-commits

[Steve D. <ste...@us...>]

Update of /cvsroot/evms/evms2/engine/plugins/jfs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11604

Modified Files:
	fs_jfs.c fsimjfs.c 
Log Message:
Cleanup compiler warnings.
Added bonus:  My editor cleans up trailing whitespace.


Index: fs_jfs.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/jfs/fs_jfs.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- fs_jfs.c	16 Jun 2005 16:53:48 -0000	1.48
+++ fs_jfs.c	15 Jan 2009 20:38:25 -0000	1.49
@@ -339,11 +339,11 @@
 	}
 
 	argv[0] = "mount";
-		
+
 	new_size_in_blocks = *new_size / (sb_ptr->s_bsize / EVMS_VSECTOR_SIZE);
 	sprintf(mount_opts, "-oremount,resize=%"PRIu64, new_size_in_blocks);
 	argv[1] = mount_opts;
-	
+
 	argv[2] = EngFncs->engine_strdup(volume->mount_point);
 	argv[3] = NULL;
 
@@ -584,9 +584,9 @@
  * Shrink the volume to new_size.  If the volume is not expanded exactly to
  * new_size, set new_size to the new_size of the volume.
  */
-static int fs_shrink( logical_volume_t * volume,
-		      sector_count_t     requested_size,
-		      sector_count_t   * new_size )
+static int fs_shrink( logical_volume_t * UNUSED(volume),
+		      sector_count_t     UNUSED(requested_size),
+		      sector_count_t   * UNUSED(new_size) )
 {
 	/* unsupported at this time */
 	int  rc = ENOSYS;
@@ -601,10 +601,11 @@
  * mkfs has been scheduled.  Do any setup work such as claiming another
  * volume for an external log.
  */
-static int fs_mkfs_setup(logical_volume_t * volume,
+static int fs_mkfs_setup(logical_volume_t * UNUSED(volume),
 			 option_array_t   * options)
 {
-	int  i, rc = 0;
+	uint  i;
+	int  rc = 0;
 	char  * ext_log_vol = NULL;
 	list_anchor_t  avail_ext_logs;
 	list_element_t logs_list_iter;
@@ -807,7 +808,7 @@
 			    list_anchor_t   selected_volumes )
 {
 	int rc = 0;
-	int count, i;
+	uint count, i;
 	logical_volume_t * vol;
 	list_element_t tmp_list_iter;
 	list_anchor_t tmp_list, selected_tmp_list;
@@ -955,7 +956,7 @@
 	}
 
 	switch (context->action) {
-		
+
 		case EVMS_Task_mkfs:
 
 			rc = fs_init_mkfs_acceptable_objects(context);
@@ -1186,10 +1187,10 @@
 	}
 
 	switch (context->action) {
-		
+
 		case EVMS_Task_mkfs:
 			switch (index) {
-				
+
 				case MKFS_CHECKBB_INDEX:
 					/* 'check for bad blocks' option set? */
 					context->option_descriptors->option[index].value.b = value->b;
@@ -1231,7 +1232,7 @@
 
 		case EVMS_Task_fsck:
 			switch (index) {
-				
+
 				case FSCK_FORCE_INDEX:
 					/* 'force check' option set? */
 
@@ -1343,7 +1344,7 @@
  * settings have changed.
  */
 static int fs_set_volumes( task_context_t * context,
-			   list_anchor_t    declined_volumes,
+			   list_anchor_t    UNUSED(declined_volumes),
 			   task_effect_t  * effect )
 {
 	int  rc = 0;
@@ -1813,8 +1814,8 @@
 /*
  * How much can file system shrink?
  */
-static int fs_can_shrink_by(logical_volume_t * volume,
-			    sector_count_t * delta)
+static int fs_can_shrink_by(logical_volume_t * UNUSED(volume),
+			    sector_count_t * UNUSED(delta))
 {
 	/* unsupported at this time */
 	int  rc = ENOSYS;

Index: fsimjfs.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/jfs/fsimjfs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fsimjfs.c	9 Aug 2004 16:19:16 -0000	1.14
+++ fsimjfs.c	15 Jan 2009 20:38:25 -0000	1.15
@@ -220,7 +220,7 @@
 		       logical_volume_t * volume,
 		       char * logsize )
 {
-	int i, opt_count = 2;
+	uint i, opt_count = 2;
 
 	argv[0] = "mkfs.jfs";
 
@@ -232,7 +232,7 @@
 		if ( options->option[i].is_number_based ) {
 
 			switch (options->option[i].number) {
-			
+
 			case MKFS_CHECKBB_INDEX:
 				/* 'check for bad blocks' option */
 				if ( options->option[i].value.b == TRUE ) {
@@ -403,7 +403,7 @@
  */
 void set_fsck_options( option_array_t * options, char ** argv, logical_volume_t * volume )
 {
-	int i, opt_count = 1;
+	uint i, opt_count = 1;
 
 	argv[0] = "fsck.jfs";
 
@@ -799,7 +799,7 @@
 
 	close(fds2[0]);
 	close(fds2[1]);
-	
+
 	return(rc|dev_rc);
 }