From owner-svn-ports-all@freebsd.org  Wed May 11 21:51:02 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFB4BB379EF;
 Wed, 11 May 2016 21:51:02 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D68518A6;
 Wed, 11 May 2016 21:51:02 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BLp1LW029110;
 Wed, 11 May 2016 21:51:01 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BLp1UI029108;
 Wed, 11 May 2016 21:51:01 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605112151.u4BLp1UI029108@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 11 May 2016 21:51:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415037 - head/news/cg/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2016 21:51:02 -0000

Author: bapt
Date: Wed May 11 21:51:01 2016
New Revision: 415037
URL: https://svnweb.freebsd.org/changeset/ports/415037

Log:
  Prevent collision with get_line

Added:
  head/news/cg/files/
  head/news/cg/files/patch-util.c   (contents, props changed)
  head/news/cg/files/patch-util.h   (contents, props changed)

Added: head/news/cg/files/patch-util.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cg/files/patch-util.c	Wed May 11 21:51:01 2016	(r415037)
@@ -0,0 +1,20 @@
+--- util.c.orig	2002-05-13 16:27:29 UTC
++++ util.c
+@@ -180,7 +180,7 @@ rename_uniq(const char *from, char **to)
+ 
+ 
+ char *
+-getline(FILE *f)
++get_line(FILE *f)
+ {
+     static char *b;
+     static int bsize;
+@@ -234,7 +234,7 @@ getline(FILE *f)
+ void
+ skip_rest(FILE *f)
+ {
+-    while (getline(f) != NULL)
++    while (get_line(f) != NULL)
+ 	;
+ }
+ 

Added: head/news/cg/files/patch-util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cg/files/patch-util.h	Wed May 11 21:51:01 2016	(r415037)
@@ -0,0 +1,11 @@
+--- util.h.orig	2002-04-24 15:45:24 UTC
++++ util.h
+@@ -57,7 +57,7 @@ void copy_stream(stream *in, out_state *
+ void debug(out_state *out, char *fmt, ...);
+ char *expand(char *path);
+ FILE *fopen_uniq(char **s);
+-char *getline(FILE *f);
++char *get_line(FILE *f);
+ void output_header(out_state *out, symbol name, struct header *h);
+ void prdebug(int level, char *fmt, ...);
+ void prdebug_init(int do_file, int do_stdout);