Imported Upstream version 1.2.3

[nfs-utils.git] / support / nfs / nfs_mntent.c

diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
index d1d124bcac6efa8b68937dc1db2bf66a860fcadc..a5216fcf829cdf2e7e1c5524e0bb750eaa53fa43 100644 (file)
--- a/support/nfs/nfs_mntent.c
+++ b/support/nfs/nfs_mntent.c
@@ -1,7 +1,7 @@
 /* Private version of the libc *mntent() routines. */
 /* Note slightly different prototypes. */
 
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+/* 1999-02-22 Arkadiusz Miskiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
  *
  * 2006-06-08 Amit Gud <agud@redhat.com>
@@ -28,7 +28,7 @@ static char *
 mangle(const char *arg) {
        const unsigned char *s = (const unsigned char *)arg;
        char *ss, *sp;
-       int n;
+       unsigned int n;
 
        n = strlen(arg);
        ss = sp = xmalloc(4*n+1);
@@ -124,7 +124,7 @@ nfs_endmntent (mntFILE *mfp) {
 }
 
 int
-nfs_addmntent (mntFILE *mfp, nfs_mntent_t *mnt) {
+nfs_addmntent (mntFILE *mfp, struct mntent *mnt) {
        char *m1, *m2, *m3, *m4;
        int res;
 
@@ -147,10 +147,10 @@ nfs_addmntent (mntFILE *mfp, nfs_mntent_t *mnt) {
 }
 
 /* Read the next entry from the file fp. Stop reading at an incorrect entry. */
-nfs_mntent_t *
+struct mntent *
 nfs_getmntent (mntFILE *mfp) {
        static char buf[4096];
-       static nfs_mntent_t me;
+       static struct mntent me;
        char *s;
 
  again: