[Pvfs2-cvs] commit by dbonnie in pvfs2/src/proto: endecode-funcs.h

[CVS commit program]

Update of /anoncvs/pvfs2/src/proto
In directory parlweb1:/tmp/cvs-serv32210/src/proto

Modified Files:
      Tag: cu-security-branch
	endecode-funcs.h 
Log Message:
Work on encoding, admin tools, and credentials.  Encode still needs work for the new credentials.


Index: endecode-funcs.h
===================================================================
RCS file: /anoncvs/pvfs2/src/proto/endecode-funcs.h,v
diff -p -u -r1.22.10.8 -r1.22.10.9
--- endecode-funcs.h	8 Jul 2008 20:10:30 -0000	1.22.10.8
+++ endecode-funcs.h	16 Jul 2008 20:02:52 -0000	1.22.10.9
@@ -739,7 +739,6 @@ static inline void decode_##name(char **
 static inline void encode_##name(char **pptr, const struct name *x) { int i; \
     encode_##t1(pptr, &x->x1); \
     encode_##t2(pptr, &x->x2); \
-    align8(pptr); \
     encode_##tn1(pptr, &x->n1); \
     if (x->n1 > 0) \
         for (i=0; i<x->n1; i++) \
@@ -749,6 +748,7 @@ static inline void encode_##name(char **
     { \
         encode_##ta2(pptr, &x->a2); \
     } \
+    align8(pptr); \
     encode_##t3(pptr, &x->x3); \
     encode_##tn3(pptr, &x->n3); \
     if (x->n3 > 0) \
@@ -759,7 +759,6 @@ static inline void encode_##name(char **
 static inline void decode_##name(char **pptr, struct name *x) { int i; \
     decode_##t1(pptr, &x->x1); \
     decode_##t2(pptr, &x->x2); \
-    align8(pptr); \
     decode_##tn1(pptr, &x->n1); \
     if (x->n1 > 0) \
     { \
@@ -775,8 +774,7 @@ static inline void decode_##name(char **
         x->a2 = decode_malloc(strlen(x->a2) * sizeof(*x->a2)); \
         decode_##ta2(pptr, &x->a2); \
     } \
-    else \
-        x->a2 = NULL; \
+    align8(pptr); \
     decode_##t3(pptr, &x->x3); \
     decode_##tn3(pptr, &x->n3); \
     if (x->n3 > 0) \