[Pvfs2-cvs] commit by nlmills in pvfs2/test/io/buffer: trove-init.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/io/buffer
In directory parlweb1:/tmp/cvs-serv17259/test/io/buffer

Modified Files:
      Tag: cu-security-branch
	trove-init.c 
Log Message:
initial merge with Orange-Branch. much will be broken


Index: trove-init.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/buffer/trove-init.c,v
diff -p -u -r1.8.18.2 -r1.8.18.3
--- trove-init.c	21 May 2010 17:34:31 -0000	1.8.18.2
+++ trove-init.c	19 Jun 2010 00:02:41 -0000	1.8.18.3
@@ -71,7 +71,7 @@ int trove_init(TROVE_coll_id *coll_id_p,
 	TROVE_keyval_s key, val;
 
     ret = trove_initialize(
-	TROVE_METHOD_DBPF, NULL, storage_space, 0);
+	TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed: run trove-mkfs first.\n");
         return -1;
@@ -124,7 +124,8 @@ int trove_init(TROVE_coll_id *coll_id_p,
                               0 /* flags */,
                               NULL,
                               trove_context,
-                              &op_id);
+                              &op_id,
+                              NULL);
     while (ret == 0) ret = trove_dspace_test(
         coll_id, op_id, trove_context, &count, NULL, NULL, &state,
         TROVE_DEFAULT_TEST_TIMEOUT);
@@ -139,7 +140,7 @@ int trove_init(TROVE_coll_id *coll_id_p,
     val.buffer = &file_handle;
     val.buffer_sz = sizeof(file_handle);
     ret = trove_keyval_write(coll_id, parent_handle, &key, &val,
-                                 0, NULL, NULL, trove_context, &op_id);
+                                 0, NULL, NULL, trove_context, &op_id, NULL);
     while (ret == 0) ret = trove_dspace_test(
          coll_id, op_id, trove_context, &count, NULL, NULL, &state,
          TROVE_DEFAULT_TEST_TIMEOUT);
@@ -180,7 +181,8 @@ int trove_init(TROVE_coll_id *coll_id_p,
                                    NULL, /* vtag */
                                    user_ptr_array,
                                    trove_context,
-                                   &op_id);
+                                   &op_id,
+                                   NULL);
         while (ret == 0) ret = trove_dspace_test(
             coll_id, op_id, trove_context, &count, NULL, NULL, &state,
             TROVE_DEFAULT_TEST_TIMEOUT);
@@ -194,7 +196,7 @@ int trove_init(TROVE_coll_id *coll_id_p,
 	*context_p = trove_context;
 
     fprintf(stderr, "+++++++++++++++++++++++++++++++\n");
-    fprintf(stderr, "Trove init: coll_id=%d, handle=%lld, context=%d\n", coll_id, lld(parent_handle), trove_context);
+    fprintf(stderr, "Trove init: coll_id=%d, handle=%lld, context=%d\n", coll_id, lld(parent_handle), (int)trove_context);
 
 	free(mybuffer);
     return 0;