diff options
| author | Neil Brown <neilb@suse.de> | 2007-03-16 18:26:37 +1100 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-03-16 18:26:37 +1100 |
| commit | a64b65aac7af65f96a24cd89fc07a31dbb5980ab (patch) | |
| tree | 4e073cd23713829f0a3548f8bc4ddcbb651255fe /support/nfs | |
| parent | ae5ec51e0ddc99dc5552e51bd5c095084dbb61aa (diff) | |
| download | nfs-utils-a64b65aac7af65f96a24cd89fc07a31dbb5980ab.tar.gz nfs-utils-a64b65aac7af65f96a24cd89fc07a31dbb5980ab.tar.xz nfs-utils-a64b65aac7af65f96a24cd89fc07a31dbb5980ab.zip | |
Remove nfs_mntent_t in favour of struct mntent
They are identical and the later allows us to use hasmntent.
Diffstat (limited to 'support/nfs')
| -rw-r--r-- | support/nfs/fstab.c | 4 | ||||
| -rw-r--r-- | support/nfs/nfs_mntent.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/support/nfs/fstab.c b/support/nfs/fstab.c index ba7e580..c900f3c 100644 --- a/support/nfs/fstab.c +++ b/support/nfs/fstab.c @@ -124,7 +124,7 @@ discard_mntentchn(struct mntentchn *mc0) { static void read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) { struct mntentchn *mc = mc0; - nfs_mntent_t *mnt; + struct mntent *mnt; while ((mnt = nfs_getmntent(mfp)) != NULL) { if (!streq(mnt->mnt_type, MNTTYPE_IGNORE)) { @@ -444,7 +444,7 @@ lock_mtab (void) { */ void -update_mtab (const char *dir, nfs_mntent_t *instead) { +update_mtab (const char *dir, struct mntent *instead) { mntFILE *mfp, *mftmp; const char *fnam = MOUNTED; struct mntentchn mtabhead; /* dummy */ diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c index d1d124b..a3fecfc 100644 --- a/support/nfs/nfs_mntent.c +++ b/support/nfs/nfs_mntent.c @@ -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: |