svn commit: [25971] trunk/uClibc/extra/scripts

[vapier at uclibc.org]

Author: vapier
Date: 2009-04-06 06:40:57 +0000 (Mon, 06 Apr 2009)
New Revision: 25971

Log:
apply getline() fix from linux kernel

Modified:
   trunk/uClibc/extra/scripts/unifdef.c


Changeset:
Modified: trunk/uClibc/extra/scripts/unifdef.c
===================================================================
--- trunk/uClibc/extra/scripts/unifdef.c	2009-04-05 23:39:14 UTC (rev 25970)
+++ trunk/uClibc/extra/scripts/unifdef.c	2009-04-06 06:40:57 UTC (rev 25971)
@@ -206,7 +206,7 @@
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -517,7 +517,7 @@
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = get_line();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -531,7 +531,7 @@
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+get_line(void)
 {
 	const char *cp;
 	int cursym;
@@ -889,9 +889,8 @@
 				cp += 1;
 			} else if (strchr(" \t", *cp) != NULL) {
 				cp += 1;
-			} else {
+			} else
 				return (cp);
-			}
 			continue;
 		case CXX_COMMENT:
 			if (strncmp(cp, "\n", 1) == 0) {