Skip to content

Commit

Permalink
lib-managesieve: managesieve-parser: Fixed function return types to b…
Browse files Browse the repository at this point in the history
…e bool rather than int.

Found with clang -Wstrict-bool.
  • Loading branch information
stephanbosch committed Aug 25, 2016
1 parent af91dd3 commit b800fc1
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions src/lib-managesieve/managesieve-parser.c
Expand Up @@ -112,7 +112,8 @@ const char *managesieve_parser_get_error
}

/* skip over everything parsed so far, plus the following whitespace */
static int managesieve_parser_skip_to_next(struct managesieve_parser *parser,
static bool
managesieve_parser_skip_to_next(struct managesieve_parser *parser,
const unsigned char **data,
size_t *data_size)
{
Expand Down Expand Up @@ -201,7 +202,8 @@ static void managesieve_parser_save_arg(struct managesieve_parser *parser,
parser->cur_type = ARG_PARSE_NONE;
}

static int is_valid_atom_char(struct managesieve_parser *parser, char chr)
static bool
is_valid_atom_char(struct managesieve_parser *parser, char chr)
{
if (IS_ATOM_SPECIAL((unsigned char)chr)) {
parser->error = "Invalid characters in atom";
Expand All @@ -214,7 +216,8 @@ static int is_valid_atom_char(struct managesieve_parser *parser, char chr)
return TRUE;
}

static int managesieve_parser_read_atom(struct managesieve_parser *parser,
static bool
managesieve_parser_read_atom(struct managesieve_parser *parser,
const unsigned char *data, size_t data_size)
{
size_t i;
Expand All @@ -230,10 +233,11 @@ static int managesieve_parser_read_atom(struct managesieve_parser *parser,
}

parser->cur_pos = i;
return parser->cur_type == ARG_PARSE_NONE;
return ( parser->cur_type == ARG_PARSE_NONE );
}

static int managesieve_parser_read_string(struct managesieve_parser *parser,
static bool
managesieve_parser_read_string(struct managesieve_parser *parser,
const unsigned char *data, size_t data_size)
{
size_t i;
Expand Down Expand Up @@ -287,10 +291,11 @@ static int managesieve_parser_read_string(struct managesieve_parser *parser,
}

parser->cur_pos = i;
return parser->cur_type == ARG_PARSE_NONE;
return ( parser->cur_type == ARG_PARSE_NONE );
}

static int managesieve_parser_literal_end(struct managesieve_parser *parser)
static bool
managesieve_parser_literal_end(struct managesieve_parser *parser)
{
if ((parser->flags & MANAGESIEVE_PARSE_FLAG_STRING_STREAM) == 0) {
if (parser->line_size >= parser->max_line_size ||
Expand All @@ -310,7 +315,8 @@ static int managesieve_parser_literal_end(struct managesieve_parser *parser)
return TRUE;
}

static int managesieve_parser_read_literal(struct managesieve_parser *parser,
static bool
managesieve_parser_read_literal(struct managesieve_parser *parser,
const unsigned char *data,
size_t data_size)
{
Expand Down Expand Up @@ -354,7 +360,8 @@ static int managesieve_parser_read_literal(struct managesieve_parser *parser,
return FALSE;
}

static int managesieve_parser_read_literal_data(struct managesieve_parser *parser,
static bool
managesieve_parser_read_literal_data(struct managesieve_parser *parser,
const unsigned char *data,
size_t data_size)
{
Expand Down Expand Up @@ -415,7 +422,8 @@ static int managesieve_parser_read_literal_data(struct managesieve_parser *parse

/* Returns TRUE if argument was fully processed. Also returns TRUE if
an argument inside a list was processed. */
static int managesieve_parser_read_arg(struct managesieve_parser *parser)
static bool
managesieve_parser_read_arg(struct managesieve_parser *parser)
{
const unsigned char *data;
size_t data_size;
Expand Down

0 comments on commit b800fc1

Please sign in to comment.