From 889b8f957e0ca70620dd087872e73931da4e7e41 Mon Sep 17 00:00:00 2001
From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 30 Jul 2004 21:13:07 +0000
Subject: [PATCH] * include/am_xdr_func.h: cannot have field-less structure;
 put a dummy field in.

* conf/autofs/autofs_solaris_v2_v3.c (xdr_autofs_rddirargs): cast
2nd arg of xdr_u_int to a u_int*, not int*.
(autofs_mount_2_req): don't use C++ // comments.
---
 ChangeLog                          | 9 +++++++++
 conf/autofs/autofs_solaris_v2_v3.c | 8 ++++----
 include/am_xdr_func.h              | 4 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76b3cfb2..2cbd0d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-30  Erez Zadok  <ezk@play.cs.columbia.edu>
+
+	* include/am_xdr_func.h: cannot have field-less structure; put a
+	dummy field in.
+
+	* conf/autofs/autofs_solaris_v2_v3.c (xdr_autofs_rddirargs): cast
+	2nd arg of xdr_u_int to a u_int*, not int*.
+	(autofs_mount_2_req): don't use C++ // comments.
+
 2004-07-30  Erez Zadok  <ezk@cs.sunysb.edu>
 
 	* m4/macros/{try_compile_anyfs,check_field}.m4: include
diff --git a/conf/autofs/autofs_solaris_v2_v3.c b/conf/autofs/autofs_solaris_v2_v3.c
index 664b6ba2..c18e40a9 100644
--- a/conf/autofs/autofs_solaris_v2_v3.c
+++ b/conf/autofs/autofs_solaris_v2_v3.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: autofs_solaris_v2_v3.c,v 1.37 2004/01/06 03:56:20 ezk Exp $
+ * $Id: autofs_solaris_v2_v3.c,v 1.38 2004/07/30 21:13:07 ezk Exp $
  *
  */
 
@@ -400,9 +400,9 @@ xdr_autofs_rddirargs(XDR *xdrs, autofs_rddirargs *objp)
 {
   if (!xdr_string(xdrs, &objp->rda_map, AUTOFS_MAXPATHLEN))
     return (FALSE);
-  if (!xdr_u_int(xdrs, (int *) &objp->rda_offset))
+  if (!xdr_u_int(xdrs, (u_int *) &objp->rda_offset))
     return (FALSE);
-  if (!xdr_u_int(xdrs, (int *) &objp->rda_count))
+  if (!xdr_u_int(xdrs, (u_int *) &objp->rda_count))
     return (FALSE);
   return (TRUE);
 }
@@ -570,7 +570,7 @@ autofs_mount_2_req(autofs_lookupargs *m,
   mf = mp->am_mnt;
   new_mp = mf->mf_ops->lookup_child(mp, m->name + m->isdirect, &err, VLOOK_CREATE);
   if (new_mp && err < 0) {
-    //new_mp->am_transp = transp;
+    /* new_mp->am_transp = transp; */
     new_mp = mf->mf_ops->mount_child(new_mp, &err);
   }
   if (new_mp == NULL) {
diff --git a/include/am_xdr_func.h b/include/am_xdr_func.h
index 2c856ca9..7d1803a0 100644
--- a/include/am_xdr_func.h
+++ b/include/am_xdr_func.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: am_xdr_func.h,v 1.14 2004/01/06 03:56:20 ezk Exp $
+ * $Id: am_xdr_func.h,v 1.15 2004/07/30 21:13:07 ezk Exp $
  *
  */
 
@@ -148,6 +148,8 @@ typedef struct am_LOOKUP3resok am_LOOKUP3resok;
 struct am_LOOKUP3resfail {
 #if 0
 	post_op_attr dir_attributes;
+#else
+	char dummy;		/* cannot have an empty declaration */
 #endif
 };
 typedef struct am_LOOKUP3resfail am_LOOKUP3resfail;
-- 
2.43.0