=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: setupapi: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Thu Oct 10 13:26:51 CDT 2013
Module: wine
Branch: master
Commit: cef6b07372bb29cb491721f64d2c1017f960b45b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef6b07372bb29cb491721f64d2c1017f960b45b
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Wed Oct 9 22:36:45 2013 +0200
setupapi: Use BOOL type where appropriate.
---
dlls/setupapi/misc.c | 2 +-
dlls/setupapi/parser.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index e7ccfe6..5f341cc 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1502,7 +1502,7 @@ static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target )
*/
DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR source, PCSTR target, PUINT type )
{
- DWORD ret = FALSE;
+ DWORD ret = 0;
WCHAR *sourceW = NULL, *targetW = NULL;
if (source && !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE;
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 744ee4c..cd101b7 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -471,14 +471,14 @@ static inline enum parser_state set_state( struct parser *parser, enum parser_st
/* check if the pointer points to an end of file */
-static inline int is_eof( const struct parser *parser, const WCHAR *ptr )
+static inline BOOL is_eof( const struct parser *parser, const WCHAR *ptr )
{
return (ptr >= parser->end || *ptr == CONTROL_Z);
}
/* check if the pointer points to an end of line */
-static inline int is_eol( const struct parser *parser, const WCHAR *ptr )
+static inline BOOL is_eol( const struct parser *parser, const WCHAR *ptr )
{
return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n');
}
@@ -528,7 +528,7 @@ static int add_section_from_token( struct parser *parser )
/* add a field containing the current token to the current line */
-static struct field *add_field_from_token( struct parser *parser, int is_key )
+static struct field *add_field_from_token( struct parser *parser, BOOL is_key )
{
struct field *field;
WCHAR *text;
@@ -648,14 +648,14 @@ static const WCHAR *key_name_state( struct parser *parser, const WCHAR *pos )
case '=':
push_token( parser, token_end );
- if (!add_field_from_token( parser, 1 )) return NULL;
+ if (!add_field_from_token( parser, TRUE )) return NULL;
parser->start = p + 1;
push_state( parser, VALUE_NAME );
set_state( parser, LEADING_SPACES );
return p + 1;
case ';':
push_token( parser, token_end );
- if (!add_field_from_token( parser, 0 )) return NULL;
+ if (!add_field_from_token( parser, FALSE )) return NULL;
push_state( parser, LINE_START );
set_state( parser, COMMENT );
return p + 1;
@@ -700,13 +700,13 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos )
{
case ';':
push_token( parser, token_end );
- if (!add_field_from_token( parser, 0 )) return NULL;
+ if (!add_field_from_token( parser, FALSE )) return NULL;
push_state( parser, LINE_START );
set_state( parser, COMMENT );
return p + 1;
case ',':
push_token( parser, token_end );
- if (!add_field_from_token( parser, 0 )) return NULL;
+ if (!add_field_from_token( parser, FALSE )) return NULL;
parser->start = p + 1;
push_state( parser, VALUE_NAME );
set_state( parser, LEADING_SPACES );
@@ -736,7 +736,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos )
}
}
push_token( parser, token_end );
- if (!add_field_from_token( parser, 0 )) return NULL;
+ if (!add_field_from_token( parser, FALSE )) return NULL;
set_state( parser, LINE_START );
return p;
}
More information about the wine-cvs
mailing list