X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fcomp_scan.c;fp=ncurses%2Ftinfo%2Fcomp_scan.c;h=fe6e8e7631cee4c30aa09bb79c2dc08438ca7c15;hp=2a9aa56371c8b3a1fca9de394a8d7b96aaa418a5;hb=89407f55b3f245bea3a8884c074940cd325ec3da;hpb=67ab4b308e932639a3a832052228d445c41c54b4 diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c index 2a9aa563..fe6e8e76 100644 --- a/ncurses/tinfo/comp_scan.c +++ b/ncurses/tinfo/comp_scan.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -50,7 +50,7 @@ #include #include -MODULE_ID("$Id: comp_scan.c,v 1.101 2012/12/08 22:19:25 tom Exp $") +MODULE_ID("$Id: comp_scan.c,v 1.102 2013/11/16 19:57:50 tom Exp $") /* * Maximum length of string capability we'll accept before raising an error. @@ -380,7 +380,7 @@ _nc_get_token(bool silent) if (end_of_stream()) { yyin = 0; - (void) next_char(); /* frees its allocated memory */ + (void) next_char(); /* frees its allocated memory */ if (tok_buf != 0) { if (_nc_curr_token.tk_name == tok_buf) _nc_curr_token.tk_name = 0; @@ -432,7 +432,7 @@ _nc_get_token(bool silent) #if NCURSES_EXT_FUNCS && !(ch == '.' && _nc_disable_period) #endif - && !strchr(terminfo_punct, (char) ch)) { + && ((strchr) (terminfo_punct, (char) ch) == 0)) { if (!silent) _nc_warning("Illegal character (expected alphanumeric or %s) - '%s'", terminfo_punct, unctrl(UChar(ch)));