summaryrefslogtreecommitdiff
path: root/distrib/special
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2012-03-04 04:05:16 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2012-03-04 04:05:16 +0000
commitea5319421a589ebd8583734a461346e1f0d91bec (patch)
treef5bd7462d5be00f2b6c3ea91c579bd03d2ef6dce /distrib/special
parentc90e6f8af6e01b6bd2b8ec8057571ae41b0ddb00 (diff)
In preparation for getline and getdelim additions to libc, rename getline()
occurrences to get_line(). Based on a diff from Jan Klemkow <j-dot-klemkow-at-wemelug-dot-de> to tech.
Diffstat (limited to 'distrib/special')
-rw-r--r--distrib/special/more/more.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/special/more/more.c b/distrib/special/more/more.c
index fb8bf5cdde7..ae66e499f48 100644
--- a/distrib/special/more/more.c
+++ b/distrib/special/more/more.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: more.c,v 1.31 2010/04/28 18:15:49 jsg Exp $ */
+/* $OpenBSD: more.c,v 1.32 2012/03/04 04:05:15 fgsch Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -166,7 +166,7 @@ int colon(char *, int, int);
int command(char *, FILE *);
int do_shell(char *);
int expand(char *, size_t, char *);
-int getline(FILE *, int *);
+int get_line(FILE *, int *);
int magic(FILE *, char *);
int number(char *);
int readch(void);
@@ -517,7 +517,7 @@ screen(FILE *f, int num_lines)
for (;;) {
while (num_lines > 0 && !Pause) {
- if ((nchars = getline(f, &length)) == EOF) {
+ if ((nchars = get_line(f, &length)) == EOF) {
if (clreol)
clreos();
return;
@@ -661,7 +661,7 @@ prompt(char *filename)
* Get a logical line.
*/
int
-getline(FILE *f, int *length)
+get_line(FILE *f, int *length)
{
int ch, lastch;
char *p, *ep;