[pkgsrc/trunk]: pkgsrc/lang/nawk/files getline -> get_line

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/604328cfa22b
branches:  trunk
changeset: 400892:604328cfa22b
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Oct 29 20:21:53 2009 +0000

description:
getline -> get_line

diffstat:

 lang/nawk/files/README.pkgsrc |  4 +++-
 lang/nawk/files/proctab.c     |  4 ++--
 lang/nawk/files/proto.h       |  4 ++--
 lang/nawk/files/run.c         |  4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r b42244173a19 -r 604328cfa22b lang/nawk/files/README.pkgsrc
--- a/lang/nawk/files/README.pkgsrc     Thu Oct 29 20:21:43 2009 +0000
+++ b/lang/nawk/files/README.pkgsrc     Thu Oct 29 20:21:53 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.pkgsrc,v 1.1 2006/07/14 14:23:06 jlam Exp $
+$NetBSD: README.pkgsrc,v 1.2 2009/10/29 20:21:53 tnn Exp $
 
 The following changes were made to the standard distribution:
 
@@ -22,3 +22,5 @@
       Mac OS with MPW.
 
     * A "NetBSD" CVS Id tag was added to each file.
+
+    * getline was renamed to get_line to avoid conflict with getline(3)
diff -r b42244173a19 -r 604328cfa22b lang/nawk/files/proctab.c
--- a/lang/nawk/files/proctab.c Thu Oct 29 20:21:43 2009 +0000
+++ b/lang/nawk/files/proctab.c Thu Oct 29 20:21:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: proctab.c,v 1.1 2006/07/14 14:23:06 jlam Exp $ */
+/* $NetBSD: proctab.c,v 1.2 2009/10/29 20:21:53 tnn Exp $ */
 
 #include <stdio.h>
 #include "awk.h"
@@ -180,7 +180,7 @@
        nullproc,       /* NUMBER */
        nullproc,       /* STRING */
        nullproc,       /* REGEXPR */
-       getline,        /* GETLINE */
+       get_line,       /* GETLINE */
        substr, /* SUBSTR */
        split,  /* SPLIT */
        jump,   /* RETURN */
diff -r b42244173a19 -r 604328cfa22b lang/nawk/files/proto.h
--- a/lang/nawk/files/proto.h   Thu Oct 29 20:21:43 2009 +0000
+++ b/lang/nawk/files/proto.h   Thu Oct 29 20:21:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: proto.h,v 1.1 2006/07/14 14:23:06 jlam Exp $ */
+/* $NetBSD: proto.h,v 1.2 2009/10/29 20:21:53 tnn Exp $ */
 
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
@@ -151,7 +151,7 @@
 extern Cell    *copycell(Cell *);
 extern Cell    *arg(Node **, int);
 extern Cell    *jump(Node **, int);
-extern Cell    *getline(Node **, int);
+extern Cell    *get_line(Node **, int);
 extern Cell    *getnf(Node **, int);
 extern Cell    *array(Node **, int);
 extern Cell    *awkdelete(Node **, int);
diff -r b42244173a19 -r 604328cfa22b lang/nawk/files/run.c
--- a/lang/nawk/files/run.c     Thu Oct 29 20:21:43 2009 +0000
+++ b/lang/nawk/files/run.c     Thu Oct 29 20:21:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.1 2006/07/14 14:23:06 jlam Exp $ */
+/* $NetBSD: run.c,v 1.2 2009/10/29 20:21:53 tnn Exp $ */
 
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
@@ -388,7 +388,7 @@
        return 0;       /* not reached */
 }
 
-Cell *getline(Node **a, int n) /* get next line from specific input */
+Cell *get_line(Node **a, int n)        /* get next line from specific input */
 {              /* a[0] is variable, a[1] is operator, a[2] is filename */
        Cell *r, *x;
        extern Cell **fldtab;