diff options
| author | bapt <bapt@FreeBSD.org> | 2016-05-10 07:50:57 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-05-10 07:50:57 +0000 |
| commit | b4d6cff400c381941a327609d63788c361032954 (patch) | |
| tree | ba3d7fb743a7d9c6ebf0f5858da9f3bc51abae0e /cddl/compat | |
| parent | 4ab2fdcc3ac162feb65377a8114013affb1e6d14 (diff) | |
| download | FreeBSD-src-b4d6cff400c381941a327609d63788c361032954.zip FreeBSD-src-b4d6cff400c381941a327609d63788c361032954.tar.gz | |
rename getline into zgetline to avoid collision with getline(3)
When getline(3) in 2009 was added a _WITH_GETLINE guard has also been added.
This rename is made in preparation for the removal of this guard
Obtained from: NetBSD
Diffstat (limited to 'cddl/compat')
| -rw-r--r-- | cddl/compat/opensolaris/misc/fsshare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c index c3247f9..97f5e20 100644 --- a/cddl/compat/opensolaris/misc/fsshare.c +++ b/cddl/compat/opensolaris/misc/fsshare.c @@ -69,7 +69,7 @@ restart_mountd(void) * mountpoint specified in the 'skip' argument. */ static char * -getline(FILE *fd, const char *skip) +zgetline(FILE *fd, const char *skip) { static char line[MAXLINESIZE]; size_t len, skiplen; @@ -200,7 +200,7 @@ fsshare_main(const char *file, const char *mountpoint, const char *shareopts, /* Place big, fat warning at the begining of the file. */ fprintf(newfd, "%s", FILE_HEADER); - while (oldfd != NULL && (line = getline(oldfd, mountpoint)) != NULL) + while (oldfd != NULL && (line = zgetline(oldfd, mountpoint)) != NULL) fprintf(newfd, "%s\n", line); if (oldfd != NULL && ferror(oldfd) != 0) { error = ferror(oldfd); |
