diff options
| author |   fgsch <fgsch@openbsd.org> | 2012-03-04 04:05:15 +0000 |
|---|---|---|
| committer | fgsch <fgsch@openbsd.org> | 2012-03-04 04:05:15 +0000 |
| commit | f9bbbf4534171e957bb7652e706dd78782fbffa2 (patch) | |
| tree | 3828b3cf6a92fdae28d55bf6c8000c490e4996d0 /usr.bin/diff3 | |
| parent | Document sem_timedwait() (diff) | |
| download | wireguard-openbsd-f9bbbf4534171e957bb7652e706dd78782fbffa2.tar.xz wireguard-openbsd-f9bbbf4534171e957bb7652e706dd78782fbffa2.zip | |
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 'usr.bin/diff3')
| -rw-r--r-- | usr.bin/diff3/diff3prog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c index 1d0aa17d70f..c6677ce2b61 100644 --- a/usr.bin/diff3/diff3prog.c +++ b/usr.bin/diff3/diff3prog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ +/* $OpenBSD: diff3prog.c,v 1.12 2012/03/04 04:05:15 fgsch Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -124,7 +124,7 @@ char f1mark[40], f3mark[40]; /* markers for -E and -X */ int duplicate(struct range *, struct range *); int edit(struct diff *, int, int); char *getchange(FILE *); -char *getline(FILE *, size_t *); +char *get_line(FILE *, size_t *); int number(char **); int readin(char *, struct diff **); int skip(int, int, char *); @@ -253,7 +253,7 @@ getchange(FILE *b) { char *line; - while ((line = getline(b, NULL))) { + while ((line = get_line(b, NULL))) { if (isdigit((unsigned char)line[0])) return (line); } @@ -261,7 +261,7 @@ getchange(FILE *b) } char * -getline(FILE *b, size_t *n) +get_line(FILE *b, size_t *n) { char *cp; size_t len; @@ -456,7 +456,7 @@ skip(int i, int from, char *pr) char *line; for (n = 0; cline[i] < from - 1; n += j) { - if ((line = getline(fp[i], &j)) == NULL) + if ((line = get_line(fp[i], &j)) == NULL) trouble(); if (pr != NULL) printf("%s%s", pr, line); |