From owner-svn-ports-head@freebsd.org  Wed May 11 21:13:23 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 6AF37B370A7;
 Wed, 11 May 2016 21:13:23 +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 382491242;
 Wed, 11 May 2016 21:13:23 +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 u4BLDMfc018784;
 Wed, 11 May 2016 21:13:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BLDMW4018783;
 Wed, 11 May 2016 21:13:22 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605112113.u4BLDMW4018783@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:13:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415034 - head/net/wmlj/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-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2016 21:13:23 -0000

Author: bapt
Date: Wed May 11 21:13:22 2016
New Revision: 415034
URL: https://svnweb.freebsd.org/changeset/ports/415034

Log:
  Prevent collision with getline(3)

Added:
  head/net/wmlj/files/
  head/net/wmlj/files/patch-src_network.c   (contents, props changed)

Added: head/net/wmlj/files/patch-src_network.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/wmlj/files/patch-src_network.c	Wed May 11 21:13:22 2016	(r415034)
@@ -0,0 +1,24 @@
+--- src/network.c.orig	2016-05-11 21:04:11 UTC
++++ src/network.c
+@@ -72,7 +72,7 @@ skipline(char *text) {
+ }
+ 
+ static char*
+-getline(char *text) {
++get_line(char *text) {
+   int len;
+   char *str;
+ 
+@@ -113,10 +113,10 @@ parse_response(char *buf) {
+   int read_keys = 0;
+ 
+   while (*buf) {
+-    key = getline(buf);
++    key = get_line(buf);
+     buf = skipline(buf);
+     if (*buf) {
+-      val = getline(buf);
++      val = get_line(buf);
+       buf = skipline(buf);
+ 
+       g_hash_table_insert(hash, g_strdup(key), g_strdup(val));