aboutsummaryrefslogtreecommitdiff
path: root/cddl/compat
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-05-10 07:50:57 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-05-10 07:50:57 +0000
commita05f81bfa3def4ef0a7e8fed227a430f80d1f8b8 (patch)
treeba3d7fb743a7d9c6ebf0f5858da9f3bc51abae0e /cddl/compat
parent32fefb2495cd9cf2e36823882cd9712d182cd9da (diff)
downloadsrc-a05f81bfa3def4ef0a7e8fed227a430f80d1f8b8.tar.gz
src-a05f81bfa3def4ef0a7e8fed227a430f80d1f8b8.zip
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
Notes
Notes: svn path=/head/; revision=299342
Diffstat (limited to 'cddl/compat')
-rw-r--r--cddl/compat/opensolaris/misc/fsshare.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
index c3247f91fec4..97f5e20f42f6 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);