[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/description:
.cvsignore pint-request.c
CVS commit program
cvs at parl.clemson.edu
Fri May 21 13:34:13 EDT 2010
Update of /projects/cvsroot/pvfs2/src/io/description
In directory parlweb1:/tmp/cvs-serv1309/src/io/description
Modified Files:
Tag: cu-security-branch
pint-request.c
Added Files:
Tag: cu-security-branch
.cvsignore
Log Message:
revert cu-security-branch to before the attempted merge with Orange-Branch
Index: pint-request.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/description/pint-request.c,v
diff -p -u -r1.61.10.1 -r1.61.10.2
--- pint-request.c 2 Sep 2009 20:16:08 -0000 1.61.10.1
+++ pint-request.c 21 May 2010 17:34:13 -0000 1.61.10.2
@@ -110,10 +110,10 @@ int PINT_process_request(PINT_Request_st
req->cur->rqbase->depth);
temp_space = (void *)malloc(sizeof(PINT_Request_state)+
(sizeof(PINT_reqstack)*req->cur->rqbase->depth));
- if(!temp_space)
- {
- return -PVFS_ENOMEM;
- }
+ if(!temp_space)
+ {
+ return -PVFS_ENOMEM;
+ }
memcpy(temp_space,req,sizeof(PINT_Request_state));
req = (PINT_Request_state *)temp_space;
@@ -164,7 +164,7 @@ int PINT_process_request(PINT_Request_st
{
/* do we allow external setting of LOGICAL_SKIP */
/* what about backwards skipping, as in seeking? */
- }
+ }
/* we should be ready to begin */
/* zero retval indicates everything flowing successfully */
@@ -173,7 +173,7 @@ int PINT_process_request(PINT_Request_st
while(!retval)
{
if (req->cur[req->lvl].rq)
- {
+ {
/* print the current state of the decoding process */
gossip_debug(GOSSIP_REQUEST_DEBUG,"\tDo seq of %lld ne %d st %lld nb %d "
"ub %lld lb %lld as %lld co %llu\n",
@@ -188,13 +188,13 @@ int PINT_process_request(PINT_Request_st
gossip_debug(GOSSIP_REQUEST_DEBUG,"\t\tto %lld ta %lld fi %lld\n",
lld(req->type_offset), lld(req->target_offset),
lld(req->final_offset));
- if (mem) /* if a mem type is specified print its state */
- {
+ if (mem) /* if a mem type is specified print its state */
+ {
gossip_debug(GOSSIP_REQUEST_DEBUG,"\t\tmto %lld mta %lld mfi %lld\n",
lld(mem->type_offset), lld(mem->target_offset),
lld(mem->final_offset));
- }
- }
+ }
+ }
/* NULL type indicates packed data - handle directly */
if (req->cur[req->lvl].rq == NULL)
{
More information about the Pvfs2-cvs
mailing list