summaryrefslogtreecommitdiffhomepage
path: root/util-linux
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-06-19 03:20:03 +0000
committerRob Landley <rob@landley.net>2006-06-19 03:20:03 +0000
commit7a260f01ce6841658810dc9f0ff0706558a10d7f (patch)
treef98b6d5bf4c3d48dd54db386c29d39ab26e1463e /util-linux
parent290fcb4213ae5ab9ec6cb228dd64ef2c9f02d26d (diff)
Make some 64 bit warnings go away on x86-64.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/nfsmount.c12
-rw-r--r--util-linux/nfsmount.h2
2 files changed, 3 insertions, 11 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index d46cf698a..705975d29 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -3,15 +3,7 @@
* nfsmount.c -- Linux NFS mount
* Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*
* Wed Feb 8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
* numbers to be specified on the command line.
@@ -965,7 +957,7 @@ xdr_mountres3_ok (XDR *xdrs, mountres3_ok *objp)
{
if (!xdr_fhandle3 (xdrs, &objp->fhandle))
return FALSE;
- if (!xdr_array (xdrs, (char **)&objp->auth_flavours.auth_flavours_val, (unsigned int *) &objp->auth_flavours.auth_flavours_len, ~0,
+ if (!xdr_array (xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0,
sizeof (int), (xdrproc_t) xdr_int))
return FALSE;
return TRUE;
diff --git a/util-linux/nfsmount.h b/util-linux/nfsmount.h
index 78a1bdfc5..60e2019b4 100644
--- a/util-linux/nfsmount.h
+++ b/util-linux/nfsmount.h
@@ -91,7 +91,7 @@ struct mountres3_ok {
fhandle3 fhandle;
struct {
unsigned int auth_flavours_len;
- int *auth_flavours_val;
+ char *auth_flavours_val;
} auth_flavours;
};
typedef struct mountres3_ok mountres3_ok;