Re: [MiNT] [Mint-cvs] [FreeMiNT CVS] freemint/sys/xfs/nfs

[David Gálvez <dgalvez75@gmail.com>]

Hi Alan,

These changes below were made to the NFS sources in the repository
together with the pach sent to the list 13/4/2012, (fixing the ext2
compilation fail when EXT2FS_DEBUG was enable).

I've informed you about it by private email but I think you've missed it.

2012/4/16  <cvs@sparemint.org>:
> Update of /mint/freemint/sys/xfs/nfs
> In directory mail.sparemint.org:/tmp/cvs-serv18300/sys/xfs/nfs
>
> Modified Files:
>        nfs_xdr.c rpc_xdr.c
> Log Message:
> Fix compile problems with EXT2FS_DEBUG enabled.
> Contributed by David Galvez.
>
>
> Index: freemint/sys/xfs/nfs/nfs_xdr.c
> diff -u freemint/sys/xfs/nfs/nfs_xdr.c:1.3 freemint/sys/xfs/nfs/nfs_xdr.c:1.4
> --- freemint/sys/xfs/nfs/nfs_xdr.c:1.3  Fri Jul 13 17:32:53 2007
> +++ freemint/sys/xfs/nfs/nfs_xdr.c      Mon Apr 16 14:00:57 2012
> @@ -283,8 +283,11 @@
>        if (!xdr_enum (x, &rp->status))
>                return FALSE;
>
> -       if (NFS_OK == rp->status)
> -               return xdr_string (x, (const char **)&rp->readlinkres_u.data, MAXPATHLEN);
> +       if (NFS_OK == rp->status) {
> +               const char *name = rp->readlinkres_u.data;
> +
> +               return xdr_string (x, &name, MAXPATHLEN);
> +       }
>
>        return TRUE;
>  }
> @@ -311,10 +314,14 @@
>
>        if (NFS_OK == rp->status)
>        {
> +               const char *name;
> +
>                if (!xdr_fattr (x, &rp->readres_u.read_ok.attributes))
>                        return FALSE;
> +
> +               name = rp->readres_u.read_ok.data_val;
>
> -               if (!xdr_opaque (x, (const char **)&rp->readres_u.read_ok.data_val,
> +               if (!xdr_opaque (x, &name,
>                                    (long *)&rp->readres_u.read_ok.data_len, MAXDATA))
>                        return FALSE;
>        }
> @@ -453,13 +460,17 @@
>  bool_t
>  xdr_entry (xdrs *x, entry *ep)
>  {
> +       const char *name;
> +
>        if (!xdr_ulong (x, &ep->fileid))
>                return FALSE;
>
>        if (XDR_DECODE == x->op)
>                ep->name = (char *) ep + sizeof (entry);
>
> -       if (!xdr_string (x, (const char **)&ep->name, MAXNAMLEN))
> +       name = ep->name;
> +
> +       if (!xdr_string (x, &name, MAXNAMLEN))
>                return FALSE;
>
>        if (!xdr_nfscookie (x, ep->cookie))
>
> Index: freemint/sys/xfs/nfs/rpc_xdr.c
> diff -u freemint/sys/xfs/nfs/rpc_xdr.c:1.3 freemint/sys/xfs/nfs/rpc_xdr.c:1.4
> --- freemint/sys/xfs/nfs/rpc_xdr.c:1.3  Fri Jul 13 17:32:53 2007
> +++ freemint/sys/xfs/nfs/rpc_xdr.c      Mon Apr 16 14:00:57 2012
> @@ -45,8 +45,10 @@
>  bool_t
>  xdr_opaque_auth(xdrs *x, opaque_auth *ap)
>  {
> +       const char *name;
>        xdr_enum(x, &ap->flavor);
> -       return xdr_opaque(x, (const char **)&ap->data, (long *)&ap->len, MAX_AUTH_BYTES);
> +       name = ap->data;
> +       return xdr_opaque(x, &name, (long *)&ap->len, MAX_AUTH_BYTES);
>  }
>
>
>
> _______________________________________________
> cz-bobek-lists-mint-cvs mailing list
> mint-cvs@lists.bobek.cz
> https://lists.bobek.cz/mailman/listinfo/cz-bobek-lists-mint-cvs