[Pvfs2-cvs] commit by nlmills in pvfs2/include: pvfs2-encode-stubs.h pvfs2-types.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv27745/include

Modified Files:
      Tag: cu-security-branch
	pvfs2-encode-stubs.h pvfs2-types.h 
Log Message:
encoding fixes


Index: pvfs2-encode-stubs.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-encode-stubs.h,v
diff -p -u -r1.14.10.6 -r1.14.10.7
--- pvfs2-encode-stubs.h	19 Jun 2010 00:01:15 -0000	1.14.10.6
+++ pvfs2-encode-stubs.h	20 Jun 2010 20:49:33 -0000	1.14.10.7
@@ -53,6 +53,7 @@
 #define endecode_fields_5(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5) struct endecode_fake_struct
 #define endecode_fields_5_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5) struct endecode_fake_struct
 #define endecode_fields_6(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct
+#define endecode_fields_6_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct
 #define endecode_fields_7_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7) struct endecode_fake_struct
 #define endecode_fields_8_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8) struct endecode_fake_struct
 #define endecode_fields_9_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8,t9,x9) struct endecode_fake_struct
@@ -70,6 +71,7 @@
 #define endecode_fields_1a_1a_struct(n,t1,x1,tn1,n1,ta1,a1,t2,x2,tn2,n2,ta2,a2) struct endecode_fake_struct
 #define endecode_fields_4a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,tn1,n1,ta1,a1) struct endecode_fake_struct
 #define endecode_fields_5a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,tn1,n1,ta1,a1) struct endecode_fake_struct
+#define endecode_fields_3a2a_struct(n,t1,x1,t2,x2,t3,x3,tn1,n1,ta1,a1,t4,x4,t5,x5,tn2,n2,ta2,a2) struct endecode_fake_struct
 
 #define encode_enum_union_2_struct(name, ename, uname, ut1, un1, en1, ut2, un2, en2) struct endecode_fake_struct
 

Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.147.4.10 -r1.147.4.11
--- pvfs2-types.h	19 Jun 2010 00:01:15 -0000	1.147.4.10
+++ pvfs2-types.h	20 Jun 2010 20:49:33 -0000	1.147.4.11
@@ -924,7 +924,7 @@ endecode_fields_3a2a_struct (
     PVFS_time, timeout,
     uint32_t, op_mask,
     uint32_t, num_handles,
-    PVFS_handle, handle_array)
+    PVFS_handle, handle_array);
 #define extra_size_PVFS_capability (PVFS_REQ_LIMIT_HANDLES_COUNT * \
                                     sizeof(PVFS_handle)          + \
                                     PVFS_REQ_LIMIT_ISSUER        + \
@@ -951,7 +951,7 @@ endecode_fields_3a2a_struct (
     string, issuer,
     PVFS_time, timeout,
     uint32_t, sig_size,
-    PVFS_signature, signature)
+    PVFS_signature, signature);
 #define extra_size_PVFS_credential (PVFS_REQ_LIMIT_GROUPS    * \
                                     sizeof(PVFS_gid)         + \
                                     PVFS_REQ_LIMIT_ISSUER    + \