r9678 jmb - in /trunk/libcss/src: parse/language.h parse/parse.c parse/properties/font.c parse/properties/generated_list.c parse/properties/utils.c select/select.c

Author: jmb Date: Sun Nov 22 07:03:21 2009 New Revision: 9678 URL: http://source.netsurf-browser.org?rev=9678&view=rev Log: Lose redundant assignments. Drop some dead code. Avoid a potential NULL dereference. Add missing "break" in initial substate of block context parser Modified: trunk/libcss/src/parse/language.h trunk/libcss/src/parse/parse.c trunk/libcss/src/parse/properties/font.c trunk/libcss/src/parse/properties/generated_list.c trunk/libcss/src/parse/properties/utils.c trunk/libcss/src/select/select.c Modified: trunk/libcss/src/parse/language.h URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/language.h?rev=9... ============================================================================== --- trunk/libcss/src/parse/language.h (original) +++ trunk/libcss/src/parse/language.h Sun Nov 22 07:03:21 2009 @@ -61,7 +61,7 @@ while ((token = parserutils_vector_peek(vector, *ctx)) != NULL && token->type == CSS_TOKEN_S) - token = parserutils_vector_iterate(vector, ctx); + parserutils_vector_iterate(vector, ctx); } /** Modified: trunk/libcss/src/parse/parse.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/parse.c?rev=9678... ============================================================================== --- trunk/libcss/src/parse/parse.c (original) +++ trunk/libcss/src/parse/parse.c Sun Nov 22 07:03:21 2009 @@ -1448,6 +1448,8 @@ return transition(parser, to, subsequent); } + + break; case WS: error = eatWS(parser); if (error != CSS_OK) Modified: trunk/libcss/src/parse/properties/font.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/properties/font.... ============================================================================== --- trunk/libcss/src/parse/properties/font.c (original) +++ trunk/libcss/src/parse/properties/font.c Sun Nov 22 07:03:21 2009 @@ -117,8 +117,6 @@ if (error == CSS_OK) { consumeWhitespace(vector, ctx); - - token = parserutils_vector_peek(vector, *ctx); } else { break; } Modified: trunk/libcss/src/parse/properties/generated_list.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/properties/gener... ============================================================================== --- trunk/libcss/src/parse/properties/generated_list.c (original) +++ trunk/libcss/src/parse/properties/generated_list.c Sun Nov 22 07:03:21 2009 @@ -671,7 +671,7 @@ close = token->idata; - token = parserutils_vector_iterate(vector, &temp_ctx); + parserutils_vector_iterate(vector, &temp_ctx); consumeWhitespace(vector, &temp_ctx); @@ -736,7 +736,7 @@ close = token->idata; - token = parserutils_vector_iterate(vector, ctx); + parserutils_vector_iterate(vector, ctx); consumeWhitespace(vector, ctx); Modified: trunk/libcss/src/parse/properties/utils.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/properties/utils... ============================================================================== --- trunk/libcss/src/parse/properties/utils.c (original) +++ trunk/libcss/src/parse/properties/utils.c Sun Nov 22 07:03:21 2009 @@ -48,8 +48,8 @@ token->type != CSS_TOKEN_HASH && token->type != CSS_TOKEN_FUNCTION)) { if (c->sheet->quirks_allowed == false || - (token != NULL && - token->type != CSS_TOKEN_NUMBER && + token == NULL || + (token->type != CSS_TOKEN_NUMBER && token->type != CSS_TOKEN_DIMENSION)) goto invalid; } Modified: trunk/libcss/src/select/select.c URL: http://source.netsurf-browser.org/trunk/libcss/src/select/select.c?rev=96... ============================================================================== --- trunk/libcss/src/select/select.c (original) +++ trunk/libcss/src/select/select.c Sun Nov 22 07:03:21 2009 @@ -417,9 +417,6 @@ /* Retrieve this property's hint from the client */ error = state->handler->node_presentational_hint(state->pw, state->node, i, &hint); - if (error != CSS_OK && error != CSS_PROPERTY_NOT_SET) - return error; - if (error != CSS_OK) return (error == CSS_PROPERTY_NOT_SET) ? CSS_OK : error;