[PVFS2-CVS] commit by slang in pvfs2/src/io/description: pint-request-encode.h pint-request.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/description
In directory parlweb:/tmp/cvs-serv12929/src/io/description

Modified Files:
      Tag: slang-sio-branch
	pint-request-encode.h pint-request.h 
Log Message:



Index: pint-request-encode.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/description/Attic/pint-request-encode.h,v
diff -p -u -r1.1.2.1 -r1.1.2.2
--- pint-request-encode.h	4 Nov 2005 15:13:30 -0000	1.1.2.1
+++ pint-request-encode.h	4 Nov 2005 16:27:16 -0000	1.1.2.2
@@ -77,24 +77,24 @@ encode_PVFS_Request_fields(
 {
     u_int32_t encti;
     encode_PVFS_offset(pptr, &(rp)->offset);
-	encode_int32_t(pptr, &(rp)->num_ereqs);
-	encode_int32_t(pptr, &(rp)->num_blocks);
-	encode_PVFS_size(pptr, &(rp)->stride);
-	encode_PVFS_offset(pptr, &(rp)->ub);
-	encode_PVFS_offset(pptr, &(rp)->lb);
-	encode_PVFS_size(pptr, &(rp)->aggregate_size);
-	encode_int32_t(pptr, &(rp)->num_contig_chunks);
-	encode_int32_t(pptr, &(rp)->depth);
-	encode_int32_t(pptr, &(rp)->num_nested_req);
-	encode_int32_t(pptr, &(rp)->committed);
-	encode_int32_t(pptr, &(rp)->refcount);
-	encode_skip4(pptr,);
+    encode_int32_t(pptr, &(rp)->num_ereqs);
+    encode_int32_t(pptr, &(rp)->num_blocks);
+    encode_PVFS_size(pptr, &(rp)->stride);
+    encode_PVFS_offset(pptr, &(rp)->ub);
+    encode_PVFS_offset(pptr, &(rp)->lb);
+    encode_PVFS_size(pptr, &(rp)->aggregate_size);
+    encode_int32_t(pptr, &(rp)->num_contig_chunks);
+    encode_int32_t(pptr, &(rp)->depth);
+    encode_int32_t(pptr, &(rp)->num_nested_req);
+    encode_int32_t(pptr, &(rp)->committed);
+    encode_int32_t(pptr, &(rp)->refcount);
+    encode_skip4(pptr,);
 
-	/* These pointers have been encoded already, just write as ints */
-	encti = (u_int32_t)(uintptr_t) (rp)->ereq;
+    /* These pointers have been encoded already, just write as ints */
+    encti = (u_int32_t)(uintptr_t) (rp)->ereq;
     encode_uint32_t(pptr, &encti);
 
-	encti = (u_int32_t)(uintptr_t) (rp)->sreq;
+    encti = (u_int32_t)(uintptr_t) (rp)->sreq;
     encode_uint32_t(pptr, &encti);
 
     return 0;
@@ -176,17 +176,17 @@ int decode_PINT_Request(char ** pptr,
         decode_int32_t(pptr, &(rp+i)->refcount);
         decode_skip4(pptr,);
 
-        /* put integer offsets into pointers, let PINT_Request_decode fix */
-		decode_uint32_t(pptr, &encti);
-		(rp+i)->ereq = (PINT_Request *)(uintptr_t) encti;
-        
-		decode_uint32_t(pptr, &encti);
-		(rp+i)->sreq = (PINT_Request *)(uintptr_t) encti;
+	/* put integer offsets into pointers, let PINT_Request_decode fix */
+	decode_uint32_t(pptr, &encti);
+	(rp+i)->ereq = (PINT_Request *)(uintptr_t) encti;
+
+	decode_uint32_t(pptr, &encti);
+	(rp+i)->sreq = (PINT_Request *)(uintptr_t) encti;
     }
 
     *req = rp;
     return 0;
 }
 
-#endif
-#endif
+#endif /* __PINT_REQPROTO_ENCODE_FUNCS_C */
+#endif /* _PINT_REQUEST_ENCODE_H_ */

Index: pint-request.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/description/pint-request.h,v
diff -p -u -r1.32.2.1 -r1.32.2.2
--- pint-request.h	4 Nov 2005 07:14:19 -0000	1.32.2.1
+++ pint-request.h	4 Nov 2005 16:27:16 -0000	1.32.2.2
@@ -42,6 +42,10 @@ struct PINT_dist_s;
 
 /* PVFS Request Processing Stuff */
 
+/**
+ * NOTE: The encoding/decoding functions must be updated
+ * with changes to this struct.  See pint-request-encode.h.
+ */
 typedef struct PINT_Request {
 	PVFS_offset  offset;        /* offset from start of last set of elements */
 	int32_t      num_ereqs;     /* number of ereqs in a block */