[Pvfs2-cvs] commit by nlmills in pvfs2/test/io/job: job-client-example.c job-server-example.c module.mk.in trove-job-create-toy.c trove-job-ls.c trove-job-mkfs.c trove-job-touch.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/io/job
In directory parlweb1:/tmp/cvs-serv1309/test/io/job

Modified Files:
      Tag: cu-security-branch
	job-client-example.c job-server-example.c module.mk.in 
	trove-job-create-toy.c trove-job-ls.c trove-job-mkfs.c 
	trove-job-touch.c 
Log Message:
revert cu-security-branch to before the attempted merge with Orange-Branch


Index: job-client-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/job-client-example.c,v
diff -p -u -r1.11.18.1 -r1.11.18.2
--- job-client-example.c	2 Sep 2009 20:17:02 -0000	1.11.18.1
+++ job-client-example.c	21 May 2010 17:34:33 -0000	1.11.18.2
@@ -95,7 +95,7 @@ int main(int argc, char **argv)	
 	/* send a message */
 	ret = job_bmi_send(server_addr, req, sizeof(struct request_foo),
 		0, BMI_PRE_ALLOC, 1, NULL, 0, &status1, &tmp_id, context,
-		JOB_TIMEOUT_INF, NULL);
+		JOB_TIMEOUT_INF);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_bmi_send() failure.\n");
@@ -122,7 +122,7 @@ int main(int argc, char **argv)	
 	/* receive a message */
 	ret = job_bmi_recv(server_addr, ack, sizeof(struct ack_foo),
 		0, BMI_PRE_ALLOC, NULL, 0, &status1, &tmp_id, context,
-		JOB_TIMEOUT_INF, NULL);
+		JOB_TIMEOUT_INF);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_bmi_recv() failure.\n");

Index: job-server-example.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/job-server-example.c,v
diff -p -u -r1.17.18.1 -r1.17.18.2
--- job-server-example.c	2 Sep 2009 20:17:02 -0000	1.17.18.1
+++ job-server-example.c	21 May 2010 17:34:33 -0000	1.17.18.2
@@ -147,7 +147,7 @@ int main(int argc, char **argv)	
 	/* send a message */
 	ret = job_bmi_send(req_info.addr, ack, sizeof(struct ack_foo),
 		0, BMI_PRE_ALLOC, 0, NULL, 0, &status1, &tmp_id, context,
-		JOB_TIMEOUT_INF, NULL);
+		JOB_TIMEOUT_INF);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_bmi_send() failure.\n");

Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/module.mk.in,v
diff -p -u -r1.15.2.1 -r1.15.2.2
--- module.mk.in	2 Sep 2009 20:17:02 -0000	1.15.2.1
+++ module.mk.in	21 May 2010 17:34:33 -0000	1.15.2.2
@@ -5,6 +5,7 @@ TEST_IO_JOB_DIR_SRC := \
 	$(DIR)/job-client-example.c \
 	$(DIR)/job-server-example.c \
 	$(DIR)/trove-job-create-toy.c \
+	$(DIR)/trove-job-io.c \
 	$(DIR)/trove-job-ls.c \
 	$(DIR)/trove-job-mkfs.c \
 	$(DIR)/trove-job-touch.c \

Index: trove-job-create-toy.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-create-toy.c,v
diff -p -u -r1.11.18.1 -r1.11.18.2
--- trove-job-create-toy.c	2 Sep 2009 20:17:02 -0000	1.11.18.1
+++ trove-job-create-toy.c	21 May 2010 17:34:33 -0000	1.11.18.2
@@ -116,8 +116,7 @@ int main(int argc, char **argv)
 			0,
 			&job_stat,
 			&foo_id,
-			context,
-                        NULL);
+			context);
 		if(ret < 0)
 		{
 			fprintf(stderr, "job_trove_dspace_create() failure.\n");

Index: trove-job-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-ls.c,v
diff -p -u -r1.12.18.1 -r1.12.18.2
--- trove-job-ls.c	2 Sep 2009 20:17:02 -0000	1.12.18.1
+++ trove-job-ls.c	21 May 2010 17:34:33 -0000	1.12.18.2
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
     while ( num_processed == chunk ) 
 	{
 		ret = job_trove_keyval_iterate(coll_id, handle, pos, key, val, chunk,
-			0, NULL, NULL, 0, &job_stat, &foo_id, context, NULL);
+			0, NULL, NULL, 0, &job_stat, &foo_id, context);
 		if(ret < 0)
 		{
 			fprintf(stderr, "keyval iterate failed.\n");

Index: trove-job-mkfs.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-mkfs.c,v
diff -p -u -r1.14.18.1 -r1.14.18.2
--- trove-job-mkfs.c	2 Sep 2009 20:17:02 -0000	1.14.18.1
+++ trove-job-mkfs.c	21 May 2010 17:34:33 -0000	1.14.18.2
@@ -177,8 +177,7 @@ int main(int argc, char **argv)
 		0,
 		&job_stat,
 		&foo_id,
-		context,
-                NULL);
+		context);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_trove_dspace_create() failure.\n");
@@ -210,7 +209,7 @@ int main(int argc, char **argv)
     val.buffer_sz = sizeof(root_handle);
 
 	ret = job_trove_fs_seteattr(coll_id, &key, &val, 0, NULL, 0,
-		&job_stat, &foo_id, context, NULL);
+		&job_stat, &foo_id, context);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_trove_fs_seteattr() failure.\n");

Index: trove-job-touch.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/job/trove-job-touch.c,v
diff -p -u -r1.12.18.1 -r1.12.18.2
--- trove-job-touch.c	2 Sep 2009 20:17:02 -0000	1.12.18.1
+++ trove-job-touch.c	21 May 2010 17:34:33 -0000	1.12.18.2
@@ -136,8 +136,7 @@ int main(int argc, char **argv)
 		0,
 		&job_stat,
 		&foo_id,
-		context,
-                NULL);
+		context);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_trove_dspace_create() failure.\n");
@@ -169,7 +168,7 @@ int main(int argc, char **argv)
     val.buffer_sz = sizeof(file_handle);
 
 	ret = job_trove_keyval_write(coll_id, parent_handle, &key,
-		&val, 0, NULL, NULL, 0, &job_stat, &foo_id, context, NULL);
+		&val, 0, NULL, NULL, 0, &job_stat, &foo_id, context);
 	if(ret < 0)
 	{
 		fprintf(stderr, "job_trove_keyval_write() failure.\n");