[Pvfs2-cvs] commit by kunkel in pvfs2/src/io/bmi/bmi_gm: bmi-gm.c

[CVS commit program]

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

Modified Files:
      Tag: kunkel-branch
	bmi-gm.c 
Log Message:
Backmerge with HEAD


Index: bmi-gm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/bmi/bmi_gm/bmi-gm.c,v
diff -p -u -r1.80.6.2 -r1.80.6.3
--- bmi-gm.c	24 Jul 2006 17:20:27 -0000	1.80.6.2
+++ bmi-gm.c	29 Aug 2006 10:41:17 -0000	1.80.6.3
@@ -54,6 +54,7 @@ void *BMI_gm_memalloc(bmi_size_t size,
 int BMI_gm_memfree(void *buffer,
 		   bmi_size_t size,
 		   enum bmi_op_type send_recv);
+int BMI_gm_unexpected_free(void *buffer);
 int BMI_gm_post_send(bmi_op_id_t * id,
 		     method_addr_p dest,
 		     const void *buffer,
@@ -148,28 +149,29 @@ char BMI_gm_method_name[] = "bmi_gm";
 
 /* exported method interface */
 struct bmi_method_ops bmi_gm_ops = {
-    BMI_gm_method_name,
-    BMI_gm_initialize,
-    BMI_gm_finalize,
-    BMI_gm_set_info,
-    BMI_gm_get_info,
-    BMI_gm_memalloc,
-    BMI_gm_memfree,
-    BMI_gm_post_send,
-    BMI_gm_post_sendunexpected,
-    BMI_gm_post_recv,
-    BMI_gm_test,
-    BMI_gm_testsome,
-    BMI_gm_testcontext,
-    BMI_gm_testunexpected,
-    BMI_gm_method_addr_lookup,
-    BMI_gm_post_send_list,
-    BMI_gm_post_recv_list,
-    BMI_gm_post_sendunexpected_list,
-    BMI_gm_open_context,
-    BMI_gm_close_context,
-    BMI_gm_cancel,
-    NULL
+    .method_name = BMI_gm_method_name,
+    .BMI_meth_initialize = BMI_gm_initialize,
+    .BMI_meth_finalize = BMI_gm_finalize,
+    .BMI_meth_set_info = BMI_gm_set_info,
+    .BMI_meth_get_info = BMI_gm_get_info,
+    .BMI_meth_memalloc = BMI_gm_memalloc,
+    .BMI_meth_memfree = BMI_gm_memfree,
+    .BMI_meth_unexpected_free = BMI_gm_unexpected_free,
+    .BMI_meth_post_send = BMI_gm_post_send,
+    .BMI_meth_post_sendunexpected_list = BMI_gm_post_sendunexpected,
+    .BMI_meth_post_recv = BMI_gm_post_recv,
+    .BMI_meth_test = BMI_gm_test,
+    .BMI_meth_testsome = BMI_gm_testsome,
+    .BMI_meth_testcontext = BMI_gm_testcontext,
+    .BMI_meth_testunexpected = BMI_gm_testunexpected,
+    .BMI_meth_method_addr_lookup = BMI_gm_method_addr_lookup,
+    .BMI_meth_post_send_list = BMI_gm_post_send_list,
+    .BMI_meth_post_recv_list = BMI_gm_post_recv_list,
+    .BMI_meth_post_sendunexpected_list = BMI_gm_post_sendunexpected_list,
+    .BMI_meth_open_context = BMI_gm_open_context,
+    .BMI_meth_close_context = BMI_gm_close_context,
+    .BMI_meth_cancel = BMI_gm_cancel,
+    .BMI_meth_rev_lookup_unexpected = NULL
 };
 
 /* module parameters */
@@ -816,6 +818,14 @@ int BMI_gm_memfree(void *buffer,
     return (0);
 }
 
+int BMI_gm_unexpected_free(void *buffer)
+{
+    if (buffer)
+    {
+        free(buffer);
+    }
+    return 0;
+}
 
 /* BMI_gm_set_info()
  *