Module Name: src
Committed By: haad
Date: Mon Aug 10 22:44:41 UTC 2009
Modified Files:
src/external/cddl/osnet/lib/libzfs: fsshare.c
Log Message:
Rename getline to zgetline to avoid clashes with NetBSD getline.
Problem found by za...@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzfs/fsshare.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzfs/fsshare.c
diff -u src/external/cddl/osnet/lib/libzfs/fsshare.c:1.1 src/external/cddl/osnet/lib/libzfs/fsshare.c:1.2
--- src/external/cddl/osnet/lib/libzfs/fsshare.c:1.1 Fri Aug 7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzfs/fsshare.c Mon Aug 10 22:44:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsshare.c,v 1.1 2009/08/07 20:57:56 haad Exp $ */
+/* $NetBSD: fsshare.c,v 1.2 2009/08/10 22:44:41 haad Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <p...@freebsd.org>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $"); */
-__RCSID("$NetBSD: fsshare.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
+__RCSID("$NetBSD: fsshare.c,v 1.2 2009/08/10 22:44:41 haad Exp $");
#include <sys/param.h>
#include <stdio.h>
@@ -65,7 +65,7 @@
* 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;
@@ -196,7 +196,7 @@
/* 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);
