[Evms-cvs-commits] evms2/engine/plugins/ocfs2 ocfs2.c,1.3,1.4

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

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

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


Index: ocfs2.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/ocfs2/ocfs2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ocfs2.c	14 Aug 2008 23:10:34 -0000	1.3
+++ ocfs2.c	16 Jan 2009 22:42:14 -0000	1.4
@@ -35,7 +35,7 @@
  * functions prototypes
  ****************************************************************************/
 static int fsim_rw_diskblocks(logical_volume_t *volume, int dev_ptr,
-			      u_int64_t disk_offset, int32_t disk_count,
+			      u_int64_t disk_offset, u_int32_t disk_count,
 			      void *data_buffer, int mode);
 static void fsim_set_mkfs_options(option_array_t *options,
 				  char **argv, char *vol_name);
@@ -260,7 +260,7 @@
 				  char *vol_name)
 {
 	int opt_count = 0;
-	int i;
+	uint i;
 
 	LOG_ENTRY();
 
@@ -406,7 +406,7 @@
  *	argv
  *
  *****************************************************************************/
-static void fsim_set_fsck_options(option_array_t *options,
+static void fsim_set_fsck_options(option_array_t * UNUSED(options),
 				  char **argv,
 				  logical_volume_t *volume)
 {
@@ -495,7 +495,7 @@
 	}
 
 	EngFncs->close_volume(volume, fd);
-		
+
 	LOG_EXIT_INT(rc);
 	return rc;
 }
@@ -577,7 +577,7 @@
 static int fsim_rw_diskblocks(logical_volume_t *volume,
 			      int dev_ptr,
 			      u_int64_t disk_offset,
-			      int32_t disk_count,
+			      u_int32_t disk_count,
 			      void *data_buffer,
 			      int mode)
 {
@@ -874,7 +874,7 @@
  *
  * PARAMETERS:
  *	volume
- *	
+ *
  * RETURNS:
  *      (0) for success
  *
@@ -1257,7 +1257,7 @@
 	LOG_ENTRY();
 
 	switch (context->action) {
-	
+
 	case EVMS_Task_mkfs:
 
 		if (oc2_version < 2) {
@@ -1411,10 +1411,10 @@
 	}
 
 	switch (context->action) {
-	
+
 	case EVMS_Task_mkfs:
 		switch (index) {
-		
+
 		case MKFS_VERSION_INDEX:
 			/* User typed over version field option set?
 			 * Ignore and reload from the option descriptor.
@@ -1439,7 +1439,7 @@
 
 	case EVMS_Task_fsck:
 		switch (index) {
-		
+
 		case FSCK_MODE_INDEX:
 			/* If mounted, only allow read-only */
 			if (EngFncs->is_mounted(context->volume->dev_node, NULL)) {
@@ -1502,8 +1502,8 @@
  *
  *****************************************************************************/
 static int oc2_set_volumes(task_context_t *context,
-			   list_anchor_t declined_volumes,
-			   task_effect_t *effect)
+			   list_anchor_t UNUSED(declined_volumes),
+			   task_effect_t * UNUSED(effect))
 {
 	int rc = 0;
 	logical_volume_t *vol;