[Evms-cvs-commits] evms2/engine/plugins/multipath mp_daemon.c, 1.11, 1.12 mp_lvm.c, 1.14, 1.15 multipath.c, 1.15, 1.16

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

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

Modified Files:
	mp_daemon.c mp_lvm.c multipath.c 
Log Message:
Cleanup compiler warnings.


Index: multipath.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/multipath/multipath.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- multipath.c	16 Jun 2005 16:53:53 -0000	1.15
+++ multipath.c	16 Jan 2009 22:34:27 -0000	1.16
@@ -115,7 +115,7 @@
 /**
  * multipath_can_delete
  **/
-static int multipath_can_delete(storage_object_t *object)
+static int multipath_can_delete(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 
@@ -128,7 +128,7 @@
  *
  * Just like can_delete().
  **/
-static int multipath_can_unassign(storage_object_t *object)
+static int multipath_can_unassign(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 
@@ -142,7 +142,7 @@
  * We aren't yet going to support volumes directly on MP objects, since
  * we're initially targetting this for LVM MP-PVs.
  **/
-static int multipath_can_set_volume(storage_object_t *object, boolean flag)
+static int multipath_can_set_volume(storage_object_t * UNUSED(object), boolean UNUSED(flag))
 {
 	LOG_ENTRY();
 
@@ -288,7 +288,7 @@
  *
  * Don't support unassign yet.
  **/
-static int multipath_unassign(storage_object_t *object)
+static int multipath_unassign(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 
@@ -323,8 +323,8 @@
  *
  * Nothing to do yet for commit, since we don't yet have any metadata.
  **/
-static int multipath_commit_changes(storage_object_t *object,
-				    commit_phase_t phase)
+static int multipath_commit_changes(storage_object_t * UNUSED(object),
+				    commit_phase_t UNUSED(phase))
 {
 	LOG_ENTRY();
 
@@ -337,7 +337,7 @@
  *
  * Multipath segments can always be activated.
  **/
-static int multipath_can_activate(storage_object_t *object)
+static int multipath_can_activate(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 	LOG_EXIT_INT(0);
@@ -382,7 +382,7 @@
  *
  * Multipath segments can always be deactivated.
  **/
-static int multipath_can_deactivate(storage_object_t *object)
+static int multipath_can_deactivate(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 	LOG_EXIT_INT(0);
@@ -452,9 +452,9 @@
  *
  * OPTIONAL
  **/
-static int multipath_get_info(storage_object_t *object,
-			      char *info_name,
-			      extended_info_array_t **info)
+static int multipath_get_info(storage_object_t * UNUSED(object),
+			      char * UNUSED(info_name),
+			      extended_info_array_t ** UNUSED(info))
 {
 	LOG_ENTRY();
 
@@ -494,8 +494,8 @@
  *
  * OPTIONAL
  **/
-static int multipath_get_plugin_info(char *info_name,
-				     extended_info_array_t **info)
+static int multipath_get_plugin_info(char * UNUSED(info_name),
+				     extended_info_array_t ** UNUSED(info))
 {
 	LOG_ENTRY();
 
@@ -552,7 +552,7 @@
  *
  * Nothing to do yet for backup, since we don't yet have any metadata.
  **/
-static int multipath_backup_metadata(storage_object_t *object)
+static int multipath_backup_metadata(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 

Index: mp_lvm.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/multipath/mp_lvm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mp_lvm.c	25 May 2005 21:45:01 -0000	1.14
+++ mp_lvm.c	16 Jan 2009 22:34:27 -0000	1.15
@@ -126,7 +126,7 @@
 		rc = ENOMEM;
 		goto out;
 	}
-	
+
 	/* Read the first sector. */
 	rc = READ(object, bytes_to_sectors(LVM_PV_DISK_BASE),
 		  bytes_to_sectors(LVM_PV_DISK_SIZE), pv_buffer);
@@ -254,7 +254,7 @@
 	dm_priority_group_t *pg = &mp->group[0];
 	char device[25];
 	char *dev, active;
-	int i, fail_count;
+	u_int32_t i, fail_count;
 
 	LOG_ENTRY();
 
@@ -286,9 +286,10 @@
 	dm_priority_group_t *pg = &mp->group[0];
 	storage_object_t *child;
 	list_element_t itr;
-	int num_paths = EngFncs->list_count(object->child_objects);
-	int matched_paths = 0, active_paths = 0;
-	int found, i, rc = EINVAL;
+	uint num_paths = EngFncs->list_count(object->child_objects);
+	uint matched_paths = 0, active_paths = 0;
+	u_int32_t i;
+	int found, rc = EINVAL;
 
 	LOG_ENTRY();
 
@@ -469,7 +470,7 @@
  * LVM has no extra private data. It attaches the PV structs to the
  * consuming-private-data of the child objects.
  **/
-int mp_lvm_allocate(storage_object_t *object)
+int mp_lvm_allocate(storage_object_t * UNUSED(object))
 {
 	LOG_ENTRY();
 	LOG_EXIT_INT(0);
@@ -521,7 +522,7 @@
  *
  * Always select the first object on the child list. No extra offsets.
  **/
-int mp_lvm_map(storage_object_t **object, lsn_t *lsn, sector_count_t *count)
+int mp_lvm_map(storage_object_t **object, lsn_t * UNUSED(lsn), sector_count_t * UNUSED(count))
 {
 	storage_object_t *child;
 	int rc = EIO;

Index: mp_daemon.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/multipath/mp_daemon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mp_daemon.c	29 Jul 2004 21:24:41 -0000	1.11
+++ mp_daemon.c	16 Jan 2009 22:34:27 -0000	1.12
@@ -129,7 +129,7 @@
 #endif
 	argv[i++] = object->name;
 	argv[i++] = object_size;
-	
+
 	LIST_FOR_EACH(object->child_objects, itr, child) {
 		argv[i++] = child->name;
 	}
@@ -223,7 +223,7 @@
 	return rc;
 }
 
-static int globerror(const char *path, int error)
+static int globerror(const char * UNUSED(path), int UNUSED(error))
 {
 	return 0;
 }
@@ -266,7 +266,8 @@
 	list_anchor_t objects;
 	list_element_t itr;
 	char lock_file_name[256];
-	int i, rc;
+	size_t i;
+	int rc;
 
 	LOG_ENTRY();
 
@@ -351,7 +352,7 @@
 void cleanup_stale_daemons(void)
 {
 	glob_t result;
-	int i;
+	size_t i;
 
 	LOG_ENTRY();