[Pvfs2-cvs] commit by slang in pvfs2/src/io/bmi: bmi-method-support.h bmi.c bmi.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/bmi
In directory parlweb1:/tmp/cvs-serv5758/src/io/bmi

Modified Files:
      Tag: WALT3
	bmi-method-support.h bmi.c bmi.h 
Log Message:
reverse merge of HEAD to WALT3 branch.


Index: bmi-method-support.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi-method-support.h,v
diff -p -u -r1.24.4.1 -r1.24.4.2
--- bmi-method-support.h	18 Sep 2006 15:05:10 -0000	1.24.4.1
+++ bmi-method-support.h	19 Oct 2006 22:16:54 -0000	1.24.4.2
@@ -135,7 +135,7 @@ struct bmi_method_ops
 				    int *,
 				    struct method_unexpected_info *,
 				    int);
-      method_addr_p(*BMI_meth_method_addr_lookup) (const char *);
+    method_addr_p (*BMI_meth_method_addr_lookup) (const char *);
     int (*BMI_meth_post_send_list) (bmi_op_id_t *,
 				    method_addr_p,
 				    const void *const *,

Index: bmi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi.c,v
diff -p -u -r1.70.4.1 -r1.70.4.2
--- bmi.c	18 Sep 2006 15:05:11 -0000	1.70.4.1
+++ bmi.c	19 Oct 2006 22:16:54 -0000	1.70.4.2
@@ -1372,7 +1372,7 @@ int BMI_query_addr_range (PVFS_BMI_addr_
     gen_mutex_lock(&active_method_count_mutex);
     while (i < active_method_count)
     {
-        char *active_method_name = (char *) active_method_table[i]->method_name + 4;
+        const char *active_method_name = active_method_table[i]->method_name + 4;
         /* provided name matches this interface */
         if (!strncmp(active_method_name, provided_method_name, provided_method_length))
         {

Index: bmi.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi.h,v
diff -p -u -r1.27.22.1 -r1.27.22.2
--- bmi.h	18 Sep 2006 15:05:11 -0000	1.27.22.1
+++ bmi.h	19 Oct 2006 22:16:54 -0000	1.27.22.2
@@ -129,7 +129,9 @@ const char* BMI_addr_rev_lookup(PVFS_BMI
 
 const char* BMI_addr_rev_lookup_unexpected(PVFS_BMI_addr_t addr);
 
-int BMI_query_addr_range (PVFS_BMI_addr_t addr, const char *id_string, int netmask);
+int BMI_query_addr_range (PVFS_BMI_addr_t addr, 
+                          const char *id_string, 
+                          int netmask);
 
 int BMI_post_send_list(bmi_op_id_t * id,
 		       PVFS_BMI_addr_t dest,