diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-10 11:11:23 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-10 11:11:23 +0000 |
commit | a651f2bc6cb7aa4b3f343bad711cbd08c77ce2e8 (patch) | |
tree | 2b1c7ed92eaf14e09f082db3b5ce30b7b4af6c2e /usr.bin/ctags | |
parent | 053a88680a00e9a9bda7ba7400ea0216342c1693 (diff) | |
download | src-a651f2bc6cb7aa4b3f343bad711cbd08c77ce2e8.tar.gz src-a651f2bc6cb7aa4b3f343bad711cbd08c77ce2e8.zip |
Rename getline with get_line to avoid collision with getline(3)
When getline(3) in 2009 was added a _WITH_GETLINE guard has also been added.
This rename is made in preparation for the removal of this guard
Obtained from: NetBSD
Notes
Notes:
svn path=/head/; revision=299355
Diffstat (limited to 'usr.bin/ctags')
-rw-r--r-- | usr.bin/ctags/C.c | 8 | ||||
-rw-r--r-- | usr.bin/ctags/ctags.h | 2 | ||||
-rw-r--r-- | usr.bin/ctags/fortran.c | 2 | ||||
-rw-r--r-- | usr.bin/ctags/lisp.c | 2 | ||||
-rw-r--r-- | usr.bin/ctags/print.c | 4 | ||||
-rw-r--r-- | usr.bin/ctags/yacc.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index 19de4689a055..22878488c3c9 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -151,7 +151,7 @@ c_entries(void) * foo\n * (arg1, */ - getline(); + get_line(); curline = lineno; if (func_entry()) { ++level; @@ -180,7 +180,7 @@ c_entries(void) case ';': if (t_def && level == t_level) { t_def = NO; - getline(); + get_line(); if (sp != tok) *sp = EOS; pfnote(tok, lineno); @@ -225,7 +225,7 @@ c_entries(void) * get line immediately; * may change before '{' */ - getline(); + get_line(); if (str_entry(c)) ++level; break; @@ -369,7 +369,7 @@ hash_entry(void) } *sp = EOS; if (dflag || c == '(') { /* only want macros */ - getline(); + get_line(); pfnote(tok, curline); } skip: if (c == '\n') { /* get rid of rest of define */ diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h index 256c8531dba1..597723df59b8 100644 --- a/usr.bin/ctags/ctags.h +++ b/usr.bin/ctags/ctags.h @@ -84,7 +84,7 @@ extern char *lbp; extern char searchar; /* ex search character */ extern int cicmp(const char *); -extern void getline(void); +extern void get_line(void); extern void pfnote(const char *, int); extern int skip_key(int); extern void put_entries(NODE *); diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index 025dac9a7c63..66d4b54b00fe 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -124,7 +124,7 @@ PF_funcs(void) continue; *cp = EOS; (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ - getline(); /* process line for ex(1) */ + get_line(); /* process line for ex(1) */ pfnote(tok, lineno); pfcnt = YES; } diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c index 19b983aa87a7..0d0e2c2e9d1a 100644 --- a/usr.bin/ctags/lisp.c +++ b/usr.bin/ctags/lisp.c @@ -99,7 +99,7 @@ l_entries(void) *cp = EOS; (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ *cp = savedc; - getline(); + get_line(); pfnote(tok, lineno); } /*NOTREACHED*/ diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c index a374b389b50d..ca5b9deb41ba 100644 --- a/usr.bin/ctags/print.c +++ b/usr.bin/ctags/print.c @@ -43,12 +43,12 @@ __FBSDID("$FreeBSD$"); #include "ctags.h" /* - * getline -- + * get_line -- * get the line the token of interest occurred on, * prepare it for printing. */ void -getline(void) +get_line(void) { long saveftell; int c; diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c index d741edbe403a..5678da557e76 100644 --- a/usr.bin/ctags/yacc.c +++ b/usr.bin/ctags/yacc.c @@ -98,7 +98,7 @@ y_entries(void) while (GETC(!=, EOF) && (intoken(c) || c == '.')) *sp++ = c; *sp = EOS; - getline(); /* may change before ':' */ + get_line(); /* may change before ':' */ while (iswhite(c)) { if (c == '\n') SETLINE; |