Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

assert -> ASSERT

Browse source 
Initialize error_line in all cases (Merge from Wine)

svn path=/trunk/; revision=19184
This commit is contained in:
Hervé Poussineau 2005-11-12 20:18:29 +00:00
parent 50e25b573a
commit e357028fa5
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/setupapi/parser.c
View file

@ -213,7 +213,7 @@ static struct line *add_line( struct inf_file *file, int section_index )
struct section *section;
struct line *line;
assert( section_index >= 0 && section_index < file->nb_sections );
ASSERT( section_index >= 0 && section_index < file->nb_sections );
section = file->sections[section_index];
if (section->nb_lines == section->alloc_lines) /* need to grow the section */
@ -420,7 +420,7 @@ static WCHAR *push_string( struct inf_file *file, const WCHAR *string )
/* push the current state on the parser stack */
inline static void push_state( struct parser *parser, enum parser_state state )
{
assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) );
ASSERT( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) );
parser->stack[parser->stack_pos++] = state;
}
@ -428,7 +428,7 @@ inline static void push_state( struct parser *parser, enum parser_state state )
/* pop the current state */
inline static void pop_state( struct parser *parser )
{
assert( parser->stack_pos );
ASSERT( parser->stack_pos );
parser->state = parser->stack[--parser->stack_pos];
}
@ -509,12 +509,12 @@ static struct field *add_field_from_token( struct parser *parser, int is_key )
{
if (parser->cur_section == -1) /* got a line before the first section */
{
parser->error = ERROR_WRONG_INF_STYLE;
parser->error = ERROR_EXPECTED_SECTION_NAME;
return NULL;
}
if (!(parser->line = add_line( parser->file, parser->cur_section ))) goto error;
}
else assert(!is_key);
else ASSERT(!is_key);
text = push_string( parser->file, parser->token );
if ((field = add_field( parser->file, text )))
@ -964,6 +964,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err
if (!strcmpiW( field->text, Windows95 )) goto done;
}
}
if (error_line) *error_line = 0;
err = ERROR_WRONG_INF_STYLE;
}