Browse Source

apply getline() fix from linux kernel

Mike Frysinger 15 years ago
parent
commit
49e81cada7
1 changed files with 4 additions and 5 deletions
  1. 4 5
      extra/scripts/unifdef.c

+ 4 - 5
extra/scripts/unifdef.c

@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static void             error(const char *);
 static int              findsym(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreoff(void);
 static void             ignoreon(void);
 static void             ignoreon(void);
@@ -517,7 +517,7 @@ process(void)
 
 
 	for (;;) {
 	for (;;) {
 		linenum++;
 		linenum++;
-		lineval = getline();
+		lineval = get_line();
 		trans_table[ifstate[depth]][lineval]();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
 		    linetype_name[lineval],
@@ -531,7 +531,7 @@ process(void)
  * help from skipcomment().
  * help from skipcomment().
  */
  */
 static Linetype
 static Linetype
-getline(void)
+get_line(void)
 {
 {
 	const char *cp;
 	const char *cp;
 	int cursym;
 	int cursym;
@@ -889,9 +889,8 @@ skipcomment(const char *cp)
 				cp += 1;
 				cp += 1;
 			} else if (strchr(" \t", *cp) != NULL) {
 			} else if (strchr(" \t", *cp) != NULL) {
 				cp += 1;
 				cp += 1;
-			} else {
+			} else
 				return (cp);
 				return (cp);
-			}
 			continue;
 			continue;
 		case CXX_COMMENT:
 		case CXX_COMMENT:
 			if (strncmp(cp, "\n", 1) == 0) {
 			if (strncmp(cp, "\n", 1) == 0) {