From db7d4daea91e105e3859cf461d7e53b9b77454b2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 13 Jun 1999 16:29:25 +0000 Subject: Merge with Linux 2.2.8. --- scripts/tkparse.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'scripts/tkparse.c') diff --git a/scripts/tkparse.c b/scripts/tkparse.c index 5bf317cdb..4b593fd0a 100644 --- a/scripts/tkparse.c +++ b/scripts/tkparse.c @@ -26,6 +26,9 @@ * every architecture and comparing it character-for-character against * the output of the old tkparse. * + * 23 January 1999, Michael Elizabeth Chastain, + * - Remove bug-compatible code. + * * TO DO: * - xconfig is at the end of its life cycle. Contact if * you are interested in working on the replacement. @@ -434,25 +437,14 @@ static void tokenize_line( const char * pnt ) case token_define_bool: pnt = get_string( pnt, &cfg->optionname ); -#if ! defined(BUG_COMPATIBLE) while ( *pnt == ' ' || *pnt == '\t' ) pnt++; -#endif if ( *pnt == 'n' || *pnt == 'N' ) cfg->value = "0"; else if ( *pnt == 'y' || *pnt == 'Y' ) cfg->value = "1"; else if ( *pnt == 'm' || *pnt == 'M' ) cfg->value = "2"; else { -#if ! defined(BUG_COMPATIBLE) syntax_error( "unknown define_bool value" ); -#else - /* - * This ought to give the same output as printf'ing - * through the null pointer ... I don't want to be - * SIGSEGV compatible! - */ - cfg->value = "(null)"; -#endif } break; @@ -504,12 +496,17 @@ static void tokenize_line( const char * pnt ) case token_hex: case token_int: - case token_string: pnt = get_qstring ( pnt, &cfg->label ); pnt = get_string ( pnt, &cfg->optionname ); pnt = get_string ( pnt, &cfg->value ); break; + case token_string: + pnt = get_qstring ( pnt, &cfg->label ); + pnt = get_string ( pnt, &cfg->optionname ); + pnt = get_qstring ( pnt, &cfg->value ); + break; + case token_if: cfg->cond = tokenize_if( pnt ); break; @@ -558,12 +555,7 @@ static void do_source( const char * filename ) if ( infile == NULL ) { sprintf( buffer, "unable to open %s", filename ); -#if defined(BUG_COMPATIBLE) - fprintf( stderr, "%s\n", buffer ); - return; -#else syntax_error( buffer ); -#endif } /* push the new file name and line number */ -- cgit v1.2.3