diff options
| author | tnn <tnn@pkgsrc.org> | 2009-10-29 20:21:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-10-29 20:21:53 +0000 |
| commit | 9f2a280d0d14431c372a10286b5d53c5905c5ed9 (patch) | |
| tree | e57ddc7df5d70ad3374dc03aa6c4a0d97a9ac3da /lang/nawk | |
| parent | dd2b8e34b96110e6669bb0787d0e20f3b902f328 (diff) | |
| download | pkgsrc-9f2a280d0d14431c372a10286b5d53c5905c5ed9.tar.gz | |
getline -> get_line
Diffstat (limited to 'lang/nawk')
| -rw-r--r-- | lang/nawk/files/README.pkgsrc | 4 | ||||
| -rw-r--r-- | lang/nawk/files/proctab.c | 4 | ||||
| -rw-r--r-- | lang/nawk/files/proto.h | 4 | ||||
| -rw-r--r-- | lang/nawk/files/run.c | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/lang/nawk/files/README.pkgsrc b/lang/nawk/files/README.pkgsrc index 2f1c44c5149..88bad6df02d 100644 --- a/lang/nawk/files/README.pkgsrc +++ b/lang/nawk/files/README.pkgsrc @@ -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 @@ The following changes were made to the standard distribution: 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 --git a/lang/nawk/files/proctab.c b/lang/nawk/files/proctab.c index 9a331e864d1..664f3a4c117 100644 --- a/lang/nawk/files/proctab.c +++ b/lang/nawk/files/proctab.c @@ -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 @@ Cell *(*proctab[92])(Node **, int) = { nullproc, /* NUMBER */ nullproc, /* STRING */ nullproc, /* REGEXPR */ - getline, /* GETLINE */ + get_line, /* GETLINE */ substr, /* SUBSTR */ split, /* SPLIT */ jump, /* RETURN */ diff --git a/lang/nawk/files/proto.h b/lang/nawk/files/proto.h index ab3a54ad06d..a808eba4569 100644 --- a/lang/nawk/files/proto.h +++ b/lang/nawk/files/proto.h @@ -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 *call(Node **, int); 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 --git a/lang/nawk/files/run.c b/lang/nawk/files/run.c index ef8e97b778d..506e98cd481 100644 --- a/lang/nawk/files/run.c +++ b/lang/nawk/files/run.c @@ -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 @@ Cell *jump(Node **a, int n) /* break, continue, next, nextfile, return */ 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; |