From 8e5d6ce1506cc9e65ad51b1c5f76e0a29616231c Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 4 Aug 2010 09:22:20 -0400 Subject: [PATCH] fix unlabelled xdr field order on sun457 kernel for now alternate to 2503 (which we will push after branching) Thanks to Andrew Deason for discovering this issue. Change-Id: I3a43bb1eab1a753f099c9d21e440f6660c706e37 Reviewed-on: http://gerrit.openafs.org/2514 Reviewed-by: Andrew Deason Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/rx/xdr_len.c | 9 ++++++++- src/rx/xdr_mem.c | 9 ++++++++- src/rx/xdr_rec.c | 9 ++++++++- src/rx/xdr_rx.c | 9 ++++++++- src/rx/xdr_stdio.c | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/rx/xdr_len.c b/src/rx/xdr_len.c index b0bd80809a..7a55daa585 100644 --- a/src/rx/xdr_len.c +++ b/src/rx/xdr_len.c @@ -90,14 +90,21 @@ static struct xdr_ops xdrlen_ops = { NULL, #endif /* Windows does not support labeled assigments */ +#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) xdrlen_getint32, /* not supported */ xdrlen_putint32, /* serialize an afs_int32 */ +#endif xdrlen_getbytes, /* not supported */ xdrlen_putbytes, /* serialize counted bytes */ xdrlen_getpos, /* get offset in the stream */ xdrlen_setpos, /* set offset in the stream */ xdrlen_inline, /* not supported */ - xdrlen_destroy /* destroy stream */ + xdrlen_destroy, /* destroy stream */ +#if (defined(KERNEL) && defined(AFS_SUN57_ENV)) + NULL, /* control - not implemented */ + xdrlen_getint32, /* not supported */ + xdrlen_putint32, /* serialize an afs_int32 */ +#endif #else #ifdef AFS_XDR_64BITOPS .x_getint64 = NULL, diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c index a489f6be98..475ea03c6a 100644 --- a/src/rx/xdr_mem.c +++ b/src/rx/xdr_mem.c @@ -68,14 +68,21 @@ static struct xdr_ops xdrmem_ops = { NULL, #endif /* Windows does not support labeled assigments */ +#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) xdrmem_getint32, /* deserialize an afs_int32 */ xdrmem_putint32, /* serialize an afs_int32 */ +#endif xdrmem_getbytes, /* deserialize counted bytes */ xdrmem_putbytes, /* serialize counted bytes */ xdrmem_getpos, /* get offset in the stream: not supported. */ xdrmem_setpos, /* set offset in the stream: not supported. */ xdrmem_inline, /* prime stream for inline macros */ - xdrmem_destroy /* destroy stream */ + xdrmem_destroy, /* destroy stream */ +#if (defined(KERNEL) && defined(AFS_SUN57_ENV)) + NULL, /* control - not implemented */ + xdrmem_getint32, /* not supported */ + xdrmem_putint32, /* serialize an afs_int32 */ +#endif #else #ifdef AFS_XDR_64BITOPS .x_getint64 = NULL, diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c index a99cfb1383..ddec33359b 100644 --- a/src/rx/xdr_rec.c +++ b/src/rx/xdr_rec.c @@ -123,14 +123,21 @@ static struct xdr_ops xdrrec_ops = { NULL, #endif /* Windows does not support labeled assignments */ +#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) xdrrec_getint32, /* deserialize an afs_int32 */ xdrrec_putint32, /* serialize an afs_int32 */ +#endif xdrrec_getbytes, /* deserialize counted bytes */ xdrrec_putbytes, /* serialize counted bytes */ xdrrec_getpos, /* get offset in the stream: not supported. */ xdrrec_setpos, /* set offset in the stream: not supported. */ xdrrec_inline, /* prime stream for inline macros */ - xdrrec_destroy /* destroy stream */ + xdrrec_destroy, /* destroy stream */ +#if (defined(KERNEL) && defined(AFS_SUN57_ENV)) + NULL, + xdrrec_getint32, /* deserialize an afs_int32 */ + xdrrec_putint32, /* serialize an afs_int32 */ +#endif #else #ifdef AFS_XDR_64BITOPS .x_getint64 = NULL, diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index 2852b6ab04..85e3ba2746 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -86,14 +86,21 @@ static struct xdr_ops xdrrx_ops = { xdrrx_putint64, /* serialize an afs_int64 */ #endif /* Windows does not support labeled assigments */ +#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) xdrrx_getint32, /* deserialize an afs_int32 */ xdrrx_putint32, /* serialize an afs_int32 */ +#endif xdrrx_getbytes, /* deserialize counted bytes */ xdrrx_putbytes, /* serialize counted bytes */ NULL, /* get offset in the stream: not supported. */ NULL, /* set offset in the stream: not supported. */ xdrrx_inline, /* prime stream for inline macros */ - NULL /* destroy stream */ + NULL, /* destroy stream */ +#if (defined(KERNEL) && defined(AFS_SUN57_ENV)) + NULL, /* control - not implemented */ + xdrrx_getint32, /* not supported */ + xdrrx_putint32, /* serialize an afs_int32 */ +#endif #else #ifdef AFS_XDR_64BITOPS .x_getint64 = xdrrx_getint64, diff --git a/src/rx/xdr_stdio.c b/src/rx/xdr_stdio.c index da280b80dc..ee941e7e75 100644 --- a/src/rx/xdr_stdio.c +++ b/src/rx/xdr_stdio.c @@ -64,14 +64,21 @@ static struct xdr_ops xdrstdio_ops = { NULL, #endif /* Windows does not support labeled assignments */ +#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) xdrstdio_getint32, /* deserialize an afs_int32 */ xdrstdio_putint32, /* serialize an afs_int32 */ +#endif xdrstdio_getbytes, /* deserialize counted bytes */ xdrstdio_putbytes, /* serialize counted bytes */ xdrstdio_getpos, /* get offset in the stream */ xdrstdio_setpos, /* set offset in the stream */ xdrstdio_inline, /* prime stream for inline macros */ - xdrstdio_destroy /* destroy stream */ + xdrstdio_destroy, /* destroy stream */ +#if (defined(KERNEL) && defined(AFS_SUN57_ENV)) + NULL, + xdrstdio_getint32, /* deserialize an afs_int32 */ + xdrstdio_putint32, /* serialize an afs_int32 */ +#endif #else #ifdef AFS_XDR_64BITOPS .x_getint64 = NULL,