Index: bin/pax/options.c
===================================================================
RCS file: /cvsroot/src/bin/pax/options.c,v
retrieving revision 1.83
diff -u -p -r1.83 options.c
--- bin/pax/options.c	10 Feb 2005 17:48:33 -0000	1.83
+++ bin/pax/options.c	28 Aug 2010 13:37:04 -0000
@@ -86,7 +86,7 @@ static int no_op(void);
 static void printflg(unsigned int);
 static int c_frmt(const void *, const void *);
 static off_t str_offt(char *);
-static char *getline(FILE *fp);
+static char *get_line(FILE *fp);
 static void pax_options(int, char **);
 static void pax_usage(void);
 static void tar_options(int, char **);
@@ -94,10 +94,10 @@ static void tar_usage(void);
 static void cpio_options(int, char **);
 static void cpio_usage(void);
 
-/* errors from getline */
+/* errors from get_line */
 #define GETLINE_FILE_CORRUPT 1
 #define GETLINE_OUT_OF_MEM 2
-static int getline_error;
+static int get_line_error;
 
 #define BZIP2_CMD	"bzip2"		/* command to run as bzip2 */
 #define GZIP_CMD	"gzip"		/* command to run as gzip */
@@ -1155,7 +1155,7 @@ tar_options(int argc, char **argv)
 						tty_warn(1, "Unable to open file '%s' for read", file);
 						tar_usage();
 					}
-					while ((str = getline(fp)) != NULL) {
+					while ((str = get_line(fp)) != NULL) {
 						if (dirisnext) {
 							dir = str;
 							dirisnext = 0;
@@ -1178,7 +1178,7 @@ tar_options(int argc, char **argv)
 						tar_usage();
 					if (strcmp(file, "-") != 0)
 						fclose(fp);
-					if (getline_error) {
+					if (get_line_error) {
 						tty_warn(1, "Problem with file '%s'", file);
 						tar_usage();
 					}
@@ -1245,7 +1245,7 @@ tar_options(int argc, char **argv)
 					tty_warn(1, "Unable to open file '%s' for read", file);
 					tar_usage();
 				}
-				while ((str = getline(fp)) != NULL) {
+				while ((str = get_line(fp)) != NULL) {
 					if (dirisnext) {
 						if (ftree_add(str, 1) < 0)
 							tar_usage();
@@ -1269,7 +1269,7 @@ tar_options(int argc, char **argv)
 					tar_usage();
 				if (strcmp(file, "-") != 0)
 					fclose(fp);
-				if (getline_error) {
+				if (get_line_error) {
 					tty_warn(1, "Problem with file '%s'",
 					    file);
 					tar_usage();
@@ -1560,11 +1560,11 @@ cpio_options(int argc, char **argv)
 				    optarg);
 				cpio_usage();
 			}
-			while ((str = getline(fp)) != NULL) {
+			while ((str = get_line(fp)) != NULL) {
 				pat_add(str, NULL);
 			}
 			fclose(fp);
-			if (getline_error) {
+			if (get_line_error) {
 				tty_warn(1, "Problem with file '%s'", optarg);
 				cpio_usage();
 			}
@@ -1716,10 +1716,10 @@ cpio_options(int argc, char **argv)
 		 * no read errors allowed on updates/append operation!
 		 */
 		maxflt = 0;
-		while ((str = getline(stdin)) != NULL) {
+		while ((str = get_line(stdin)) != NULL) {
 			ftree_add(str, 0);
 		}
-		if (getline_error) {
+		if (get_line_error) {
 			tty_warn(1, "Problem while reading stdin");
 			cpio_usage();
 		}
@@ -1944,21 +1944,21 @@ str_offt(char *val)
 }
 
 char *
-getline(FILE *f)
+get_line(FILE *f)
 {
 	char *name, *temp;
 	size_t len;
 
 	name = fgetln(f, &len);
 	if (!name) {
-		getline_error = ferror(f) ? GETLINE_FILE_CORRUPT : 0;
+		get_line_error = ferror(f) ? GETLINE_FILE_CORRUPT : 0;
 		return(0);
 	}
 	if (name[len-1] != '\n')
 		len++;
 	temp = malloc(len);
 	if (!temp) {
-		getline_error = GETLINE_OUT_OF_MEM;
+		get_line_error = GETLINE_OUT_OF_MEM;
 		return(0);
 	}
 	memcpy(temp, name, len-1);
Index: gnu/dist/toolchain/gcc/f/com.h
===================================================================
RCS file: /cvsroot/src/gnu/dist/toolchain/gcc/f/Attic/com.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 com.h
--- gnu/dist/toolchain/gcc/f/com.h	26 Jul 2000 00:17:57 -0000	1.1.1.1
+++ gnu/dist/toolchain/gcc/f/com.h	28 Aug 2010 13:37:15 -0000
@@ -310,7 +310,7 @@ void ffecom_finish_decl (tree decl, tree
 void ffecom_finish_progunit (void);
 tree ffecom_get_invented_identifier (const char *pattern, const char *text,
 				     int number);
-ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt ix);
+ffeinfoBasictype ffecom_gfrt_basictype (ffecomGfrt ix);
 ffeinfoKindtype ffecom_gfrt_kindtype (ffecomGfrt ix);
 void ffecom_init_0 (void);
 void ffecom_init_2 (void);
Index: usr.bin/ctags/C.c
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/C.c,v
retrieving revision 1.12
diff -u -p -r1.12 C.c
--- usr.bin/ctags/C.c	17 Feb 2005 17:29:58 -0000	1.12
+++ usr.bin/ctags/C.c	28 Aug 2010 13:37:26 -0000
@@ -165,7 +165,7 @@ c_entries(void)
 				 *	foo\n
 				 *	(arg1,
 				 */
-				getline();
+				get_line();
 				curline = lineno;
 				if (func_entry()) {
 					++level;
@@ -194,7 +194,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);
@@ -229,7 +229,7 @@ c_entries(void)
 						 * get line immediately;
 						 * may change before '{'
 						 */
-						getline();
+						get_line();
 						if (str_entry(c))
 							++level;
 						break;
@@ -394,7 +394,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 */
Index: usr.bin/ctags/ctags.h
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/ctags.h,v
retrieving revision 1.8
diff -u -p -r1.8 ctags.h
--- usr.bin/ctags/ctags.h	17 Feb 2005 17:29:58 -0000	1.8
+++ usr.bin/ctags/ctags.h	28 Aug 2010 13:37:26 -0000
@@ -80,7 +80,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 *);
Index: usr.bin/ctags/fortran.c
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/fortran.c,v
retrieving revision 1.10
diff -u -p -r1.10 fortran.c
--- usr.bin/ctags/fortran.c	17 Feb 2005 17:29:58 -0000	1.10
+++ usr.bin/ctags/fortran.c	28 Aug 2010 13:37:26 -0000
@@ -130,7 +130,7 @@ PF_funcs(void)
 			continue;
 		*cp = EOS;
 		(void)strlcpy(tok, lbp, sizeof(tok));
-		getline();			/* process line for ex(1) */
+		get_line();			/* process line for ex(1) */
 		pfnote(tok, lineno);
 		pfcnt = YES;
 	}
Index: usr.bin/ctags/lisp.c
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/lisp.c,v
retrieving revision 1.10
diff -u -p -r1.10 lisp.c
--- usr.bin/ctags/lisp.c	17 Feb 2005 17:29:58 -0000	1.10
+++ usr.bin/ctags/lisp.c	28 Aug 2010 13:37:26 -0000
@@ -105,7 +105,7 @@ l_entries(void)
 		*cp = EOS;
 		(void)strlcpy(tok, lbp, sizeof(tok));
 		*cp = savedc;
-		getline();
+		get_line();
 		pfnote(tok, lineno);
 	}
 	/*NOTREACHED*/
Index: usr.bin/ctags/print.c
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/print.c,v
retrieving revision 1.9
diff -u -p -r1.9 print.c
--- usr.bin/ctags/print.c	17 Feb 2005 17:29:58 -0000	1.9
+++ usr.bin/ctags/print.c	28 Aug 2010 13:37:26 -0000
@@ -51,12 +51,12 @@ __RCSID("$NetBSD$");
 #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;
Index: usr.bin/ctags/yacc.c
===================================================================
RCS file: /cvsroot/src/usr.bin/ctags/yacc.c,v
retrieving revision 1.10
diff -u -p -r1.10 yacc.c
--- usr.bin/ctags/yacc.c	17 Feb 2005 17:29:58 -0000	1.10
+++ usr.bin/ctags/yacc.c	28 Aug 2010 13:37:26 -0000
@@ -105,7 +105,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;
Index: usr.bin/gencat/gencat.c
===================================================================
RCS file: /cvsroot/src/usr.bin/gencat/gencat.c,v
retrieving revision 1.19
diff -u -p -r1.19 gencat.c
--- usr.bin/gencat/gencat.c	5 Jan 2004 23:23:34 -0000	1.19
+++ usr.bin/gencat/gencat.c	28 Aug 2010 13:37:27 -0000
@@ -126,7 +126,7 @@ static	void	corrupt __P((void));
 static	char   *cskip __P((char *));
 static	void	error __P((char *, char *));
 static	void	nomem __P((void));
-static	char   *getline __P((int));
+static	char   *get_line __P((int));
 static	char   *getmsg __P((int, char *, char));
 static	void	warning __P((char *, char *));
 static	char   *wskip __P((char *));
@@ -262,7 +262,7 @@ xstrdup(str)
 }
 
 static char *
-getline(fd)
+get_line(fd)
 	int     fd;
 {
 	static long curlen = BUFSIZ;
@@ -371,7 +371,7 @@ getmsg(fd, cptr, quote)
 				++cptr;
 				switch (*cptr) {
 				case '\0':
-					cptr = getline(fd);
+					cptr = get_line(fd);
 					if (!cptr)
 						error(NULL, "premature end of file");
 					msglen += strlen(cptr);
@@ -444,7 +444,7 @@ MCParse(fd)
 
 	/* XXX: init sethead? */
 
-	while ((cptr = getline(fd))) {
+	while ((cptr = get_line(fd))) {
 		if (*cptr == '$') {
 			++cptr;
 			if (strncmp(cptr, "set", 3) == 0) {