ldap_value = hash_table_lookup(ctx->ldap_attrs, field_name);
if (ldap_value == NULL) {
/* requested ldap attribute wasn't returned at all */
- if (ctx->debug)
+ if (ctx->debug != NULL)
str_printfa(ctx->debug, "; %s missing", field_name);
return db_ldap_field_get_default(data);
}
hash_table_lookup(ctx->ldap_attrs, field->ldap_attr_name);
if (ldap_value != NULL)
ldap_value->used = TRUE;
- else if (ctx->debug && *field->ldap_attr_name != '\0')
+ else if (ctx->debug != NULL && *field->ldap_attr_name != '\0')
str_printfa(ctx->debug, "; %s missing", field->ldap_attr_name);
str_truncate(ctx->var, 0);
str_append(str, "qop=\""); first_qop = TRUE;
for (i = 0; i < QOP_COUNT; i++) {
- if (request->qop & (1 << i)) {
+ if ((request->qop & (1 << i)) != 0) {
if (first_qop)
first_qop = FALSE;
else
(struct ntlm_auth_request *)auth_request;
const char *error;
- if (!request->challenge) {
+ if (request->challenge == NULL) {
const struct ntlmssp_request *ntlm_request =
(const struct ntlmssp_request *)data;
const struct ntlmssp_challenge *message;
message = ntlmssp_create_challenge(request->pool, ntlm_request,
&message_size);
flags = read_le32(&message->flags);
- request->ntlm2_negotiated = flags & NTLMSSP_NEGOTIATE_NTLM2;
- request->unicode_negotiated = flags & NTLMSSP_NEGOTIATE_UNICODE;
+ request->ntlm2_negotiated = (flags & NTLMSSP_NEGOTIATE_NTLM2) != 0;
+ request->unicode_negotiated = (flags & NTLMSSP_NEGOTIATE_UNICODE) != 0;
request->challenge = message->challenge;
auth_request_handler_reply_continue(auth_request, message,
const char *server_final_message;
int len;
- if (!request->client_first_message_bare) {
+ if (request->client_first_message_bare == NULL) {
/* Received client-first-message */
if (parse_scram_client_first(request, data,
data_size, &error)) {
sp += sizeof(magic)-1;
/* It stops at the first '$', max 8 chars */
- for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+ for(ep=sp;*ep != '\0' && *ep != '$' && ep < (sp+8);ep++)
continue;
/* get the length of the true salt */
safe_memset(final, 0, sizeof(final));
/* Then something really weird... */
- for (j=0,i = pw_len; i ; i >>= 1)
- if(i&1)
+ for (j=0,i = pw_len; i != 0; i >>= 1)
+ if ((i&1) != 0)
md5_update(&ctx, final+j, 1);
else
md5_update(&ctx, pw+j, 1);
*/
for(i=0;i<1000;i++) {
md5_init(&ctx1);
- if(i & 1)
+ if((i & 1) != 0)
md5_update(&ctx1,pw,pw_len);
else
md5_update(&ctx1,final,MD5_RESULTLEN);
- if(i % 3)
+ if((i % 3) != 0)
md5_update(&ctx1,sp,sl);
- if(i % 7)
+ if((i % 7) != 0)
md5_update(&ctx1,pw,pw_len);
- if(i & 1)
+ if((i & 1) != 0)
md5_update(&ctx1,final,MD5_RESULTLEN);
else
md5_update(&ctx1,pw,pw_len);
{
buffer_t *buf = buffer_create_dynamic(pool, 32);
- while (*str) {
+ while (*str != '\0') {
buffer_append_c(buf, '\0');
buffer_append_c(buf, *str++);
}
return FALSE;
}
- if (remote_ring_completed && !conn->dir->ring_handshaked) {
+ if (remote_ring_completed != 0 && !conn->dir->ring_handshaked) {
/* clear everything we have and use only what remote sends us */
hosts = mail_hosts_get(conn->dir->mail_hosts);
while (array_count(hosts) > 0) {
hostp = array_idx(hosts, 0);
director_remove_host(conn->dir, NULL, NULL, *hostp);
}
- } else if (!remote_ring_completed && conn->dir->ring_handshaked) {
+ } else if (remote_ring_completed == 0 && conn->dir->ring_handshaked) {
/* ignore whatever remote sends */
conn->ignore_host_events = TRUE;
}
} else if (show_field != NULL) {
unsigned int show_field_len = strlen(show_field);
- for (; *fields; fields++) {
+ for (; *fields != NULL; fields++) {
if (strncmp(*fields, show_field, show_field_len) == 0 &&
(*fields)[show_field_len] == '=')
printf("%s\n", *fields + show_field_len + 1);
if (updated_username != NULL)
printf(" %-10s: %s\n", "user", updated_username);
- for (; *fields; fields++) {
+ for (; *fields != NULL; fields++) {
p = strchr(*fields, '=');
if (p == NULL)
printf(" %-10s\n", *fields);
ctx = cmd_director_init(cctx);
if (ctx->ip == NULL ||
net_addr2ip(ctx->ip, &ip) < 0 ||
- (ctx->port && net_str2port(ctx->port, &port) < 0)) {
+ (ctx->port != 0 && net_str2port(ctx->port, &port) < 0)) {
director_cmd_help(cctx->cmd);
return;
}
int i_strccdascmp(const char *a, const char *b)
{
- while(*a && *b) {
+ while(*a != '\0' && *b != '\0') {
if ((*a == ' ' || *a == '-') && *a != *b && *b != ' ' && *b != '-') {
if (i_toupper(*(a+1)) == *(b)) a++;
else break;
exporter->export_received_timestamps =
(flags & DSYNC_MAILBOX_EXPORTER_FLAG_TIMESTAMPS) != 0;
exporter->hdr_hash_version =
- (flags & DSYNC_MAILBOX_EXPORTER_FLAG_HDR_HASH_V2) ? 2 : 1;
+ (flags & DSYNC_MAILBOX_EXPORTER_FLAG_HDR_HASH_V2) != 0 ? 2 : 1;
exporter->no_hdr_hashes =
(flags & DSYNC_MAILBOX_EXPORTER_FLAG_NO_HDR_HASHES) != 0;
p_array_init(&exporter->requested_uids, pool, 16);
str_truncate(str, 0);
str_printfa(str, "* %u FETCH (", ctx->seq);
- if (ctx->imap_flags & IMAP_SYNC_FLAG_SEND_UID)
+ if ((ctx->imap_flags & IMAP_SYNC_FLAG_SEND_UID) != 0)
str_printfa(str, "UID %u ", ctx->mail->uid);
if ((ctx->client->enabled_features & MAILBOX_FEATURE_CONDSTORE) != 0 &&
!ctx->client->nonpermanent_modseqs) {
str_truncate(str, 0);
str_printfa(str, "* %u FETCH (", ctx->seq);
- if (ctx->imap_flags & IMAP_SYNC_FLAG_SEND_UID)
+ if ((ctx->imap_flags & IMAP_SYNC_FLAG_SEND_UID) != 0)
str_printfa(str, "UID %u ", ctx->mail->uid);
imap_sync_add_modseq(ctx, str);
str_append_c(str, ')');
cmd->sync->counter == client->sync_counter) {
if ((cmd->sync->flags & MAILBOX_SYNC_FLAG_FAST) != 0)
fast_count++;
- if (cmd->sync->flags & MAILBOX_SYNC_FLAG_NO_EXPUNGES)
+ if ((cmd->sync->flags & MAILBOX_SYNC_FLAG_NO_EXPUNGES) != 0)
noexpunges_count++;
*flags_r |= cmd->sync->flags;
*imap_flags_r |= cmd->sync->imap_flags;
for (cmd = client->command_queue; cmd != NULL; cmd = cmd->next) {
if (cmd->sync != NULL &&
cmd->sync->counter == client->sync_counter) {
- if (cmd->sync->flags & MAILBOX_SYNC_FLAG_NO_EXPUNGES) {
+ if ((cmd->sync->flags & MAILBOX_SYNC_FLAG_NO_EXPUNGES) != 0) {
if (first_nonexpunge == NULL)
first_nonexpunge = cmd;
} else {
void dcrypt_openssl_ctx_sym_destroy(struct dcrypt_context_symmetric **ctx)
{
pool_t pool = (*ctx)->pool;
- if ((*ctx)->ctx) EVP_CIPHER_CTX_free((*ctx)->ctx);
+ if ((*ctx)->ctx != NULL) EVP_CIPHER_CTX_free((*ctx)->ctx);
pool_unref(&pool);
*ctx = NULL;
}
if (ctx->cur_map.scope == NULL) {
ctx->cur_map.scope_val = 2; /* subtree */
} else {
- if (!strcasecmp(ctx->cur_map.scope, "one")) ctx->cur_map.scope_val = 1;
- else if (!strcasecmp(ctx->cur_map.scope, "base")) ctx->cur_map.scope_val = 0;
- else if (!strcasecmp(ctx->cur_map.scope, "subtree")) ctx->cur_map.scope_val = 2;
+ if (strcasecmp(ctx->cur_map.scope, "one") == 0) ctx->cur_map.scope_val = 1;
+ else if (strcasecmp(ctx->cur_map.scope, "base") == 0) ctx->cur_map.scope_val = 0;
+ else if (strcasecmp(ctx->cur_map.scope, "subtree") == 0) ctx->cur_map.scope_val = 2;
else return "Scope must be one, base or subtree";
}
if (!array_is_created(&ctx->cur_map.ldap_attributes)) {
if (req->state < HTTP_SERVER_REQUEST_STATE_FINISHED)
req->state = HTTP_SERVER_REQUEST_STATE_ABORTED;
- if (server->ioloop)
+ if (server->ioloop != NULL)
io_loop_stop(server->ioloop);
if (req->delay_destroy) {
static void
test_signal_handler(int signo)
{
- if (terminating)
+ if (terminating != 0)
raise(signo);
terminating = 1;
static void
test_signal_handler(int signo)
{
- if (terminating)
+ if (terminating != 0)
raise(signo);
terminating = 1;
struct message_part_body_data *data = part->context;
bool text;
- if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) {
+ if ((part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0) {
str_append(str, "\"message\" \"rfc822\"");
text = FALSE;
} else {
if (text) {
/* text/.. contains line count */
str_printfa(str, " %u", part->body_size.lines);
- } else if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) {
+ } else if ((part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0) {
/* message/rfc822 contains envelope + body + line count */
struct message_part_body_data *child_data;
void imap_bodystructure_write(const struct message_part *part,
string_t *dest, bool extended)
{
- if (part->flags & MESSAGE_PART_FLAG_MULTIPART)
+ if ((part->flags & MESSAGE_PART_FLAG_MULTIPART) != 0)
part_write_body_multipart(part, dest, extended);
else
part_write_body(part, dest, extended);
ext = array_idx_modifiable(&map->extensions, ctx->cur_ext_map_idx);
ext->reset_id = u->new_reset_id;
- if (!u->preserve_data)
+ if (u->preserve_data == 0)
mail_index_sync_ext_clear(ctx->view, map, ext);
ext_hdr = get_ext_header(map, ext);
unsigned int i, keyword_count;
int ret;
- if ((ctx->view->map->hdr.flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) &&
+ if ((ctx->view->map->hdr.flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) != 0 &&
(ctx->flags & MAIL_INDEX_SYNC_FLAG_FLUSH_DIRTY) != 0) {
/* show dirty flags as flag updates */
mail_index_sync_add_dirty_updates(ctx);
(flags & MAIL_INDEX_SYNC_FLAG_DROP_RECENT) != 0)
return TRUE;
- if ((hdr->flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) &&
+ if ((hdr->flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) != 0 &&
(flags & MAIL_INDEX_SYNC_FLAG_FLUSH_DIRTY) != 0)
return TRUE;
(flags & MAIL_INDEX_SYNC_FLAG_DROP_RECENT) != 0)
return TRUE;
- if ((view->map->hdr.flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) &&
+ if ((view->map->hdr.flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) != 0 &&
(flags & MAIL_INDEX_SYNC_FLAG_FLUSH_DIRTY) != 0)
return TRUE;
buf = buffer_create_dynamic(pool_datastack_create(), 256);
for (offset = 0; offset <= sizeof(t->pre_hdr_change); offset++) {
- if (offset < sizeof(t->pre_hdr_change) && mask[offset]) {
+ if (offset < sizeof(t->pre_hdr_change) && mask[offset] != 0) {
if (state == 0) {
u.offset = offset;
state++;
ext_reset = reset[ext_id];
else
ext_reset.new_reset_id = 0;
- if ((ext_id < resize_count && resize[ext_id].name_size) ||
+ if ((ext_id < resize_count && resize[ext_id].name_size > 0) ||
ext_reset.new_reset_id != 0 ||
(ext_id < hdrs_count && hdrs[ext_id].alloc_size > 0)) {
if (ext_reset.new_reset_id != 0) {
while (s != end) {
h = (h << 4) + *s;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
timeout_remove(&(conn->to_disconnect));
if (conn->to_reconnect != NULL)
timeout_remove(&(conn->to_reconnect));
- if (conn->request_queue) {
+ if (conn->request_queue != NULL) {
unsigned int n = aqueue_count(conn->request_queue);
for (unsigned int i = 0; i < n; i++) {
line->value = msg + colon_pos+1;
line->value_len = size - colon_pos - 1;
- if (ctx->flags & MESSAGE_HEADER_PARSER_FLAG_SKIP_INITIAL_LWSP) {
+ if ((ctx->flags & MESSAGE_HEADER_PARSER_FLAG_SKIP_INITIAL_LWSP) != 0) {
/* get value. skip all LWSP after ':'. Note that
RFC2822 doesn't say we should, but history behind
it..
buffer_append_c(ctx->value_buf, '\r');
buffer_append_c(ctx->value_buf, '\n');
}
- if ((ctx->flags & MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE) &&
+ if ((ctx->flags & MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE) != 0 &&
line->value_len > 0 && line->value[0] != ' ' &&
IS_LWSP(line->value[0])) {
buffer_append_c(ctx->value_buf, ' ');
i_assert(ctx->last_boundary == NULL);
ctx->multipart = FALSE;
ctx->parse_next_block = parse_next_body_to_boundary;
- } else if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822)
+ } else if ((part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0)
ctx->parse_next_block = parse_next_body_message_rfc822_init;
else if (ctx->boundaries != NULL)
ctx->parse_next_block = parse_next_body_to_boundary;
children_count = 0;
}
- if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) {
+ if ((part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0) {
/* Only one child is possible */
if (children_count == 0) {
ctx->error =
message_header_encode_q(str_data(input) + skip,
str_len(input) - skip, str,
i == 0 ? 0 : i+1);
- test_assert(verify_q(str_c(str), i, !skip));
+ test_assert(verify_q(str_c(str), i, skip == 0));
}
}
test_end();
message_header_encode_b(str_data(input) + skip,
str_len(input) - skip, str,
i == 0 ? 0 : i+1);
- test_assert(verify_b(str_c(str), i, !skip));
+ test_assert(verify_b(str_c(str), i, skip == 0));
}
}
test_end();
if ((p1->children != NULL) != (p2->children != NULL))
return FALSE;
- if (p1->children) {
+ if (p1->children != NULL) {
if (!msg_parts_cmp(p1->children, p2->children))
return FALSE;
}
const struct setting_parser_context *parser;
const char *error;
- output.used_local = output.service_uses_local && rand() % 2;
+ output.used_local = output.service_uses_local && (rand() % 2) != 0;
if (output.used_local) {
input.local_ip.family = AF_INET;
input.local_ip.u.ip4.s_addr = 100 + rand() % 100;
}
- output.used_remote = output.service_uses_remote && rand() % 2;
+ output.used_remote = output.service_uses_remote && (rand() % 2) != 0;
if (output.used_remote) {
input.remote_ip.family = AF_INET;
input.remote_ip.u.ip4.s_addr = 100 + rand() % 100;
static uint32_t bitsel(uint32_t * input, const int *bitnums, int size)
{
uint32_t ret = 0;
- while (size--) {
+ while (size-- > 0) {
int bitpos = *bitnums++;
ret <<= 1;
if (bitpos >= 0)
buffer_t *wstr;
wstr = buffer_create_dynamic(unsafe_data_stack_pool, 32);
- for ( ; *src; src++) {
+ for ( ; *src != '\0'; src++) {
buffer_append_c(wstr, ucase ? i_toupper(*src) : *src);
buffer_append_c(wstr, '\0');
}
{
unsigned int length = 0;
- for ( ; *str; str++) {
+ for ( ; *str != '\0'; str++) {
buffer_append_c(buf, ucase ? i_toupper(*str) : *str);
if (unicode) {
buffer_append_c(buf, 0);
uint32_t flags = NTLMSSP_NEGOTIATE_NTLM |
NTLMSSP_NEGOTIATE_TARGET_INFO;
- if (client_flags & NTLMSSP_NEGOTIATE_UNICODE)
+ if ((client_flags & NTLMSSP_NEGOTIATE_UNICODE) != 0)
flags |= NTLMSSP_NEGOTIATE_UNICODE;
else
flags |= NTLMSSP_NEGOTIATE_OEM;
- if (client_flags & NTLMSSP_NEGOTIATE_NTLM2)
+ if ((client_flags & NTLMSSP_NEGOTIATE_NTLM2) != 0)
flags |= NTLMSSP_NEGOTIATE_NTLM2;
- if (client_flags & NTLMSSP_REQUEST_TARGET)
+ if ((client_flags & NTLMSSP_REQUEST_TARGET) != 0)
flags |= NTLMSSP_REQUEST_TARGET | NTLMSSP_TARGET_TYPE_SERVER;
return flags;
buffer_write(buf, 0, &c, sizeof(c));
- if (flags & NTLMSSP_TARGET_TYPE_SERVER)
+ if ((flags & NTLMSSP_TARGET_TYPE_SERVER) != 0)
ntlmssp_append_string(buf,
offsetof(struct ntlmssp_challenge, target_name),
my_hostname, unicode);
return buffer_free_without_data(&buf);
}
-static int ntlmssp_check_buffer(const struct ntlmssp_buffer *buffer,
- size_t data_size, const char **error)
+static bool ntlmssp_check_buffer(const struct ntlmssp_buffer *buffer,
+ size_t data_size, const char **error)
{
uint32_t offset = read_le32(&buffer->offset);
uint16_t length = read_le16(&buffer->length);
/* Empty buffer is ok */
if (length == 0 && space == 0)
- return 1;
+ return TRUE;
if (offset >= data_size) {
*error = "buffer offset out of bounds";
- return 0;
+ return FALSE;
}
if (offset + space > data_size) {
*error = "buffer end out of bounds";
- return 0;
+ return FALSE;
}
- return 1;
+ return TRUE;
}
bool ntlmssp_check_request(const struct ntlmssp_request *request,
static inline const char *otp_skip_lws(const char *data)
{
- while (*data && IS_LWS(*data))
+ while (*data != '\0' && IS_LWS(*data))
data++;
return data;
}
-static inline int otp_check_tail(const char *data)
+static inline bool otp_check_tail(const char *data)
{
data = otp_skip_lws(data);
str = t_str_new(18);
buffer_create_from_data(&buf, hash, OTP_HASH_SIZE);
- while (*data) {
+ while (*data != '\0') {
char c = *data;
if (i_isxdigit(c)) {
buffer_create_from_data(&buf, bits, sizeof(bits));
- for (; *data && (count < OTP_WORDS_NUMBER); data++) {
+ for (; *data != '\0' && (count < OTP_WORDS_NUMBER); data++) {
char c = *data;
if (space) {
if ((str_len(word) > 0) && (count == OTP_WORDS_NUMBER - 1))
add_word();
- if (endptr)
+ if (endptr != NULL)
*endptr = data;
if (count < OTP_WORDS_NUMBER)
return -1;
}
- if (otp_check_tail(end) != 0) {
+ if (otp_check_tail(end)) {
*error = "trailing garbage found";
return -1;
}
return FALSE;
p = STRUCT_MEMBER_P(link->change_struct, def->offset);
- return *p;
+ return *p != 0;
}
int settings_parse_line(struct setting_parser_context *ctx, const char *line)
line = str_unescape(line+1);
}
- errormsg = skip ? NULL :
+ errormsg = skip > 0 ? NULL :
callback(key, line, context);
} else if (strcmp(key, "}") != 0 || *line != '\0') {
/* b) + errors */
CassError rc;
const char *type;
- if (cass_value_is_null(value)) {
+ if (cass_value_is_null(value) != 0) {
*str_r = NULL;
return 0;
}
if (result->iterator == NULL)
return -1;
- if (!cass_iterator_next(result->iterator))
+ if (cass_iterator_next(result->iterator) == 0)
return 0;
result->row_count++;
driver_pgsql_stop_io(db);
- while (PQconsumeInput(db->pg)) {
- if (PQisBusy(db->pg)) {
+ while (PQconsumeInput(db->pg) != 0) {
+ if (PQisBusy(db->pg) != 0) {
db->io = io_add(PQsocket(db->pg), IO_READ,
consume_results, db);
db->io_dir = IO_READ;
driver_pgsql_stop_io(db);
- if (!PQconsumeInput(db->pg)) {
+ if (PQconsumeInput(db->pg) == 0) {
result_finish(result);
return;
}
- if (PQisBusy(db->pg)) {
+ if (PQisBusy(db->pg) != 0) {
db->io = io_add(PQsocket(db->pg), IO_READ,
get_result, result);
db->io_dir = IO_READ;
result->to = timeout_add(SQL_QUERY_TIMEOUT_SECS * 1000,
query_timeout, result);
- if (!PQsendQuery(db->pg, query) ||
+ if (PQsendQuery(db->pg, query) == 0 ||
(ret = PQflush(db->pg)) < 0) {
/* failed to send query */
result_finish(result);
{
struct pgsql_result *result = (struct pgsql_result *)_result;
- if (PQgetisnull(result->pgres, result->rownum, idx))
+ if (PQgetisnull(result->pgres, result->rownum, idx) != 0)
return NULL;
return PQgetvalue(result->pgres, result->rownum, idx);
const char *value;
struct pgsql_binary_value *binary_value;
- if (PQgetisnull(result->pgres, result->rownum, idx)) {
+ if (PQgetisnull(result->pgres, result->rownum, idx) != 0) {
*size_r = 0;
return NULL;
}
ssl_io = SSL_get_ex_data(ssl, dovecot_ssl_extdata_index);
/* Well, I'm not exactly sure why the logic in here is this.
It's the same as in Postfix, so it can't be too wrong. */
- if (is_export && keylength == 512 && ssl_io->ctx->dh_512 != NULL)
+ if (is_export != 0 && keylength == 512 && ssl_io->ctx->dh_512 != NULL)
return ssl_io->ctx->dh_512;
else
return ssl_io->ctx->dh_default;
if (openssl_iostream_load_key(set, &pkey, error_r) < 0)
return -1;
- if (!SSL_CTX_use_PrivateKey(ctx->ssl_ctx, pkey)) {
+ if (SSL_CTX_use_PrivateKey(ctx->ssl_ctx, pkey) == 0) {
*error_r = t_strdup_printf(
"Can't load SSL private key: %s",
openssl_iostream_key_load_error());
while ((ca = PEM_read_bio_X509(in,NULL,NULL,NULL)) != NULL) {
r = SSL_CTX_add_extra_chain_cert(ctx, ca);
- if (!r) {
+ if (r == 0) {
X509_free(ca);
ret = 0;
goto end;
i_fatal("sk_X509_NAME_new_null() failed");
for(i = 0; i < sk_X509_INFO_num(inf); i++) {
itmp = sk_X509_INFO_value(inf, i);
- if(itmp->x509) {
+ if(itmp->x509 != NULL) {
X509_STORE_add_cert(store, itmp->x509);
xname = X509_get_subject_name(itmp->x509);
if (xname != NULL)
if (xname != NULL)
sk_X509_NAME_push(xnames, xname);
}
- if(itmp->crl)
+ if(itmp->crl != NULL)
X509_STORE_add_crl(store, itmp->crl);
}
sk_X509_INFO_pop_free(inf, X509_INFO_free);
ca_dir = set->ca_dir == NULL || *set->ca_dir == '\0' ?
NULL : set->ca_dir;
if (ca_file != NULL || ca_dir != NULL) {
- if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, ca_file, ca_dir)) {
+ if (SSL_CTX_load_verify_locations(ctx->ssl_ctx, ca_file, ca_dir) == 0) {
*error_r = t_strdup_printf(
"Can't load CA certs from directory %s: %s",
set->ca_dir, openssl_iostream_error());
{
ctx->set = ssl_iostream_settings_dup(ctx->pool, set);
if (set->cipher_list != NULL &&
- !SSL_CTX_set_cipher_list(ctx->ssl_ctx, set->cipher_list)) {
+ SSL_CTX_set_cipher_list(ctx->ssl_ctx, set->cipher_list) == 0) {
*error_r = t_strdup_printf("Can't set cipher list to '%s': %s",
set->cipher_list, openssl_iostream_error());
return -1;
int nid;
const char *curve_name;
#endif
- if (SSL_CTX_need_tmp_RSA(ssl_ctx))
+ if (SSL_CTX_need_tmp_RSA(ssl_ctx) != 0)
SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
#ifdef HAVE_ECDH
#ifdef SSL_CTRL_SET_ECDH_AUTO
/* OpenSSL >= 1.0.2 automatically handles ECDH temporary key parameter
selection. */
- if (!SSL_CTX_set_ecdh_auto(ssl_ctx, 1)) {
+ if (SSL_CTX_set_ecdh_auto(ssl_ctx, 1) == 0) {
/* shouldn't happen */
*error_r = t_strdup_printf("SSL_CTX_set_ecdh_auto() failed: %s",
openssl_iostream_error());
certname[0] = '\0';
else
certname[sizeof(certname)-1] = '\0'; /* just in case.. */
- if (!preverify_ok) {
+ if (preverify_ok == 0) {
openssl_iostream_set_error(ssl_io, t_strdup_printf(
"Received invalid SSL certificate: %s: %s",
X509_verify_cert_error_string(ctx->error), certname));
} else if (ssl_io->verbose) {
i_info("Received valid SSL certificate: %s", certname);
}
- if (!preverify_ok) {
+ if (preverify_ok == 0) {
ssl_io->cert_broken = TRUE;
if (ssl_io->require_valid_cert) {
ssl_io->handshake_failed = TRUE;
if (set->cipher_list != NULL &&
strcmp(ctx_set->cipher_list, set->cipher_list) != 0) {
- if (!SSL_set_cipher_list(ssl_io->ssl, set->cipher_list)) {
+ if (SSL_set_cipher_list(ssl_io->ssl, set->cipher_list) == 0) {
*error_r = t_strdup_printf(
"Can't set cipher list to '%s': %s",
set->cipher_list, openssl_iostream_error());
nextflag = *oldflags == '\0' || *oldflags == MAILDIR_FLAGS_SEP ?
256 : (unsigned char) *oldflags;
- if ((flags_left & MAIL_DRAFT) && nextflag > 'D') {
+ if ((flags_left & MAIL_DRAFT) != 0 && nextflag > 'D') {
str_append_c(flags_str, 'D');
flags_left &= ~MAIL_DRAFT;
}
- if ((flags_left & MAIL_FLAGGED) && nextflag > 'F') {
+ if ((flags_left & MAIL_FLAGGED) != 0 && nextflag > 'F') {
str_append_c(flags_str, 'F');
flags_left &= ~MAIL_FLAGGED;
}
- if ((flags_left & MAIL_ANSWERED) && nextflag > 'R') {
+ if ((flags_left & MAIL_ANSWERED) != 0 && nextflag > 'R') {
str_append_c(flags_str, 'R');
flags_left &= ~MAIL_ANSWERED;
}
- if ((flags_left & MAIL_SEEN) && nextflag > 'S') {
+ if ((flags_left & MAIL_SEEN) != 0 && nextflag > 'S') {
str_append_c(flags_str, 'S');
flags_left &= ~MAIL_SEEN;
}
- if ((flags_left & MAIL_DELETED) && nextflag > 'T') {
+ if ((flags_left & MAIL_DELETED) != 0 && nextflag > 'T') {
str_append_c(flags_str, 'T');
flags_left &= ~MAIL_DELETED;
}
while (*s != MAILDIR_INFO_SEP && *s != '\0') {
i_assert(*s != '/');
h = (h << 4) + *s;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
return -1;
}
- if (mbox->mbox_hdr.dirty_flag)
+ if (mbox->mbox_hdr.dirty_flag != 0)
return 0;
mail_storage_set_critical(&mbox->storage->storage,
return 0;
}
- if (mbox->mbox_hdr.dirty_flag) {
+ if (mbox->mbox_hdr.dirty_flag != 0) {
/* we're dirty - make sure this is the correct mail */
if (!mbox_sync_parse_match_mail(mbox, view, seq))
return 0;
i_assert(mbox->mbox_lock_id == (lock_id & ~1));
- if (lock_id & 1) {
+ if ((lock_id & 1) != 0) {
/* dropping exclusive lock */
i_assert(mbox->mbox_excl_locks > 0);
if (--mbox->mbox_excl_locks > 0)
i_assert(ctx->last_char == '\n');
- if (ctx->mbox_md5_ctx) {
+ if (ctx->mbox_md5_ctx != NULL) {
unsigned char hdr_md5_sum[16];
if (ctx->x_delivery_id_header != NULL) {
} else {
/* if there's no sync records left, we can stop. except if
this is a dirty sync, check if there are new messages. */
- if (!sync_ctx->mbox->mbox_hdr.dirty_flag)
+ if (sync_ctx->mbox->mbox_hdr.dirty_flag == 0)
return 0;
messages_count =
if (mail_ctx->mail.uid_broken && partial) {
/* UID ordering problems, resync everything to make
sure we get everything right */
- if (sync_ctx->mbox->mbox_hdr.dirty_flag)
+ if (sync_ctx->mbox->mbox_hdr.dirty_flag != 0)
return 0;
mbox_sync_set_critical(sync_ctx,
} else if ((uint32_t)st->st_mtime == mbox_hdr->sync_mtime &&
(uint64_t)st->st_size == mbox_hdr->sync_size) {
/* file is fully synced */
- if (mbox_hdr->dirty_flag && (flags & MBOX_SYNC_UNDIRTY) != 0)
+ if (mbox_hdr->dirty_flag != 0 && (flags & MBOX_SYNC_UNDIRTY) != 0)
partial = FALSE;
else
partial = TRUE;
if ((uint32_t)st->st_mtime == mbox->mbox_hdr.sync_mtime &&
(uint64_t)st->st_size == mbox->mbox_hdr.sync_size) {
/* fully synced */
- if (!mbox->mbox_hdr.dirty_flag || leave_dirty)
+ if (mbox->mbox_hdr.dirty_flag != 0 || leave_dirty)
return 0;
/* flushing dirtyness */
}
subarg = subarg->next;
}
if (arg->match_not && arg->result != -1)
- arg->result = !arg->result;
+ arg->result = arg->result > 0 ? 0 : 1;
} else if (arg->type == SEARCH_OR) {
/* OR-list of conditions */
i_assert(arg->value.subargs != NULL);
subarg = subarg->next;
}
if (arg->match_not && arg->result != -1)
- arg->result = !arg->result;
+ arg->result = arg->result > 0 ? 0 : 1;
} else {
/* just a single condition */
callback(arg, context);
#define ARG_SET_RESULT(arg, res) \
STMT_START { \
(arg)->result = !(arg)->match_not ? (res) : \
- (res) == -1 ? -1 : !(res); \
+ ((res) == -1 ? -1 : ((res) == 0 ? 1 : 0)); \
} STMT_END
typedef void mail_search_foreach_callback_t(struct mail_search_arg *arg,
char ch;
int fd;
- tty = isatty(STDIN_FILENO);
+ tty = isatty(STDIN_FILENO) != 0;
if (tty) {
fputs(prompt, stderr);
fflush(stderr);
void buffer_create_from_const_data(buffer_t *buffer,
const void *data, size_t size);
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 401
-#define buffer_create_from_data(b,d,s) ({ \
- (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)?(s):1)); \
+#define buffer_create_from_data(b,d,s) ({ \
+ (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)>0?(s):1)); \
buffer_create_from_data((b), (d), (s)); })
-#define buffer_create_from_const_data(b,d,s) ({ \
- (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)?(s):1)); \
+#define buffer_create_from_const_data(b,d,s) ({ \
+ (void)COMPILE_ERROR_IF_TRUE(__builtin_object_size((d),1) < ((s)>0?(s):1)); \
buffer_create_from_const_data((b), (d), (s)); })
#endif
/* Creates a dynamically growing buffer. Whenever write would exceed the
use our own instead if really needed */
#define i_toupper(x) ((char) toupper((int) (unsigned char) (x)))
#define i_tolower(x) ((char) tolower((int) (unsigned char) (x)))
-#define i_isalnum(x) isalnum((int) (unsigned char) (x))
-#define i_isalpha(x) isalpha((int) (unsigned char) (x))
-#define i_isascii(x) isascii((int) (unsigned char) (x))
-#define i_isblank(x) isblank((int) (unsigned char) (x))
-#define i_iscntrl(x) iscntrl((int) (unsigned char) (x))
-#define i_isdigit(x) isdigit((int) (unsigned char) (x))
-#define i_isgraph(x) isgraph((int) (unsigned char) (x))
-#define i_islower(x) islower((int) (unsigned char) (x))
-#define i_isprint(x) isprint((int) (unsigned char) (x))
-#define i_ispunct(x) ispunct((int) (unsigned char) (x))
-#define i_isspace(x) isspace((int) (unsigned char) (x))
-#define i_isupper(x) isupper((int) (unsigned char) (x))
-#define i_isxdigit(x) isxdigit((int) (unsigned char) (x))
+#define i_isalnum(x) (isalnum((int) (unsigned char) (x)) != 0)
+#define i_isalpha(x) (isalpha((int) (unsigned char) (x)) != 0)
+#define i_isascii(x) (isascii((int) (unsigned char) (x)) != 0)
+#define i_isblank(x) (isblank((int) (unsigned char) (x)) != 0)
+#define i_iscntrl(x) (iscntrl((int) (unsigned char) (x)) != 0)
+#define i_isdigit(x) (isdigit((int) (unsigned char) (x)) != 0)
+#define i_isgraph(x) (isgraph((int) (unsigned char) (x)) != 0)
+#define i_islower(x) (islower((int) (unsigned char) (x)) != 0)
+#define i_isprint(x) (isprint((int) (unsigned char) (x)) != 0)
+#define i_ispunct(x) (ispunct((int) (unsigned char) (x)) != 0)
+#define i_isspace(x) (isspace((int) (unsigned char) (x)) != 0)
+#define i_isupper(x) (isupper((int) (unsigned char) (x)) != 0)
+#define i_isxdigit(x) (isxdigit((int) (unsigned char) (x)) != 0)
#ifndef EOVERFLOW
# define EOVERFLOW ERANGE
dest_size = page_size;
while (psize > 0) {
- if (bits[poffset / CHAR_BIT] & (1 << (poffset % CHAR_BIT))) {
+ if ((bits[poffset / CHAR_BIT] & (1 << (poffset % CHAR_BIT))) != 0) {
/* page is already in cache */
dest_offset += page_size;
if (dest_offset <= cache->read_highwater) {
fl.l_start = 0;
fl.l_len = 0;
- ret = fcntl(fd, timeout_secs ? F_SETLKW : F_SETLK, &fl);
+ ret = fcntl(fd, timeout_secs != 0 ? F_SETLKW : F_SETLK, &fl);
if (timeout_secs != 0) alarm(0);
if (ret == 0)
while (*s != '\0') {
h = (h << 4) + *s;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
while (*s != '\0') {
h = (h << 4) + i_toupper(*s);
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
for (i = 0; i < size; i++) {
h = (h << 4) + *s;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
}
#define io_check_condition(ctx, fd, cond) \
- ((FD_ISSET((fd), &(ctx)->tmp_read_fds) && ((cond) & (IO_READ|IO_ERROR))) || \
- (FD_ISSET((fd), &(ctx)->tmp_write_fds) && ((cond) & IO_WRITE)) || \
+ ((FD_ISSET((fd), &(ctx)->tmp_read_fds) && ((cond) & (IO_READ|IO_ERROR)) != 0) || \
+ (FD_ISSET((fd), &(ctx)->tmp_write_fds) && ((cond) & IO_WRITE) != 0) || \
(FD_ISSET((fd), &(ctx)->tmp_except_fds)))
void io_loop_handler_run_internal(struct ioloop *ioloop)
#endif
#if __GNUC__ > 2
-# define unlikely(expr) __builtin_expect(!!(expr), 0)
-# define likely(expr) __builtin_expect(!!(expr), 1)
+# define unlikely(expr) (__builtin_expect((expr) ? 1 : 0, 0) != 0)
+# define likely(expr) (__builtin_expect((expr) ? 1 : 0, 1) != 0)
#else
# define unlikely(expr) expr
# define likely(expr) expr
d += saved_d;
ptr += 64;
- } while (size -= 64);
+ } while ((size -= 64) != 0);
ctx->a = a;
ctx->b = b;
used = saved_lo & 0x3f;
- if (used) {
+ if (used != 0) {
free = 64 - used;
if (size < free) {
d += saved_d;
ptr += 64;
- } while (size -= 64);
+ } while ((size -= 64) != 0);
ctx->a = a;
ctx->b = b;
used = saved_lo & 0x3f;
- if (used) {
+ if (used != 0) {
free = 64 - used;
if (size < free) {
for (; len > 0; len--, p++) {
h = (h << 4) + *p;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
timing_get_median(t) <= copy[input_size/2],
input_size);
/* when we have 20 elements, [19] is the max, not the 95th %ile, so subtract 1 */
- test_assert_idx(timing_get_95th(t) == copy[input_size*95/100 - !(input_size%20)],
+ test_assert_idx(timing_get_95th(t) == copy[input_size*95/100 - ((input_size%20) == 0 ? 1 : 0)],
input_size);
i_free(copy);
collate_out = buffer_create_dynamic(default_pool, 32);
uni_utf8_to_decomposed_titlecase(collate_in, sizeof(collate_in),
collate_out);
- test_assert(!strcmp(collate_out->data, collate_exp));
+ test_assert(strcmp(collate_out->data, collate_exp) == 0);
buffer_free(&collate_out);
test_assert(!uni_utf8_str_is_valid(overlong_utf8));
{
string_t *ret = t_str_new(256);
- while (*str) {
+ while (*str != '\0') {
if (*str == '.')
str_append(ret, ",dc=");
else
return ma[0] == '\0' ? MATCH : NOMATCH;
}
/* find the end of each string */
- while (*(mask++));
+ while (*(mask++) != '\0');
mask-=2;
- while (*(data++));
+ while (*(data++) != '\0');
data-=2;
while (data >= na) {
/* If the mask runs out of chars before the string, fall back on
* a wildcard or fail. */
if (mask < ma) {
- if (lsm) {
+ if (lsm != NULL) {
data = --lsn;
mask = lsm;
if (data < na)
sofar++; /* Tally the match */
continue; /* Next char, please */
}
- if (lsm) { /* To to fallback on '*' */
+ if (lsm != NULL) { /* To to fallback on '*' */
data = --lsn;
mask = lsm;
if (data < na)
req.remote_ip = client->ip;
req.client_pid = getpid();
if (client->ssl_proxy != NULL &&
- ssl_proxy_get_compression(client->ssl_proxy))
+ ssl_proxy_get_compression(client->ssl_proxy) != NULL)
req.flags |= MAIL_AUTH_REQUEST_FLAG_TLS_COMPRESSION;
memcpy(req.cookie, anvil_request->cookie, sizeof(req.cookie));
and it should be enough to check only the first few bytes. */
for (i = 0; i < 16 && ctx->cert[i] != '\0'; i++) {
h = (h << 4) + ctx->cert[i];
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
static DH *ssl_tmp_dh_callback(SSL *ssl ATTR_UNUSED,
int is_export, int keylength)
{
- if (is_export && keylength == 512 && ssl_params.dh_512 != NULL)
+ if (is_export != 0 && keylength == 512 && ssl_params.dh_512 != NULL)
return ssl_params.dh_512;
return ssl_params.dh_default;
/* no CRL given with the CA list. don't worry about it. */
preverify_ok = 1;
}
- if (!preverify_ok)
+ if (preverify_ok == 0)
proxy->cert_broken = TRUE;
subject = X509_get_subject_name(ctx->current_cert);
}
if (proxy->ssl_set->verbose_ssl ||
- (proxy->login_set->auth_verbose && !preverify_ok)) {
- if (preverify_ok) {
+ (proxy->login_set->auth_verbose && preverify_ok == 0)) {
+ if (preverify_ok != 0) {
client_log(proxy->client, t_strdup_printf(
"Valid certificate: %s", buf));
} else {
}
for(i = 0; i < sk_X509_INFO_num(inf); i++) {
itmp = sk_X509_INFO_value(inf, i);
- if(itmp->x509) {
+ if(itmp->x509 != NULL) {
X509_STORE_add_cert(store, itmp->x509);
xname = X509_get_subject_name(itmp->x509);
if (xname != NULL && xnames_r != NULL) {
sk_X509_NAME_push(*xnames_r, xname);
}
}
- if(itmp->crl)
+ if(itmp->crl != NULL)
X509_STORE_add_crl(store, itmp->crl);
}
sk_X509_INFO_pop_free(inf, X509_INFO_free);
int nid;
const char *curve_name;
#endif
- if (SSL_CTX_need_tmp_RSA(ssl_ctx))
+ if (SSL_CTX_need_tmp_RSA(ssl_ctx) != 0)
SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
#ifdef HAVE_ECDH
while ((ca = PEM_read_bio_X509(in,NULL,NULL,NULL)) != NULL) {
r = SSL_CTX_add_extra_chain_cert(ctx, ca);
- if (!r) {
+ if (r == 0) {
X509_free(ca);
ret = 0;
goto end;
#ifdef WCOREDUMP
int signum = WTERMSIG(status);
- if (WCOREDUMP(status)) {
+ if (WCOREDUMP(status) != 0) {
str_append(str, " (core dumped)");
return;
}
while (*s != '\0') {
h = (h << 4) + *s;
- if ((g = h & 0xf0000000UL)) {
+ if ((g = h & 0xf0000000UL) != 0) {
h = h ^ (g >> 24);
h = h ^ g;
}
if (conn->xml_failed)
return -1;
- if (XML_Parse(conn->xml_parser, data, size, done))
+ if (XML_Parse(conn->xml_parser, data, size, done) != 0)
return 0;
err = XML_GetErrorCode(conn->xml_parser);
struct push_notification_event_flagsclear_data *data = event->data;
const char *const *keyword;
- if (data->flags_clear & MAIL_ANSWERED) {
+ if ((data->flags_clear & MAIL_ANSWERED) != 0) {
i_debug("%s: Answered flag cleared", EVENT_NAME);
}
- if (data->flags_clear & MAIL_FLAGGED) {
+ if ((data->flags_clear & MAIL_FLAGGED) != 0) {
i_debug("%s: Flagged flag cleared", EVENT_NAME);
}
- if (data->flags_clear & MAIL_DELETED) {
+ if ((data->flags_clear & MAIL_DELETED) != 0) {
i_debug("%s: Deleted flag cleared", EVENT_NAME);
}
- if (data->flags_clear & MAIL_SEEN) {
+ if ((data->flags_clear & MAIL_SEEN) != 0) {
i_debug("%s: Seen flag cleared", EVENT_NAME);
}
- if (data->flags_clear & MAIL_DRAFT) {
+ if ((data->flags_clear & MAIL_DRAFT) != 0) {
i_debug("%s: Draft flag cleared", EVENT_NAME);
}
flags = mail_get_flags(mail);
for (i = 0; i < N_ELEMENTS(flag_check_always); i++) {
- if (!(flags & flag_check_always[i]) &&
- (old_flags & flag_check_always[i])) {
+ if ((flags & flag_check_always[i]) == 0 &&
+ (old_flags & flag_check_always[i]) != 0) {
data->flags_clear |= flag_check_always[i];
}
}
struct push_notification_event_flagsset_data *data = event->data;
const char *const *keyword;
- if (data->flags_set & MAIL_ANSWERED) {
+ if ((data->flags_set & MAIL_ANSWERED) != 0) {
i_debug("%s: Answered flag set", EVENT_NAME);
}
- if (data->flags_set & MAIL_FLAGGED) {
+ if ((data->flags_set & MAIL_FLAGGED) != 0) {
i_debug("%s: Flagged flag set", EVENT_NAME);
}
- if (data->flags_set & MAIL_DELETED) {
+ if ((data->flags_set & MAIL_DELETED) != 0) {
i_debug("%s: Deleted flag set", EVENT_NAME);
}
- if (data->flags_set & MAIL_SEEN) {
+ if ((data->flags_set & MAIL_SEEN) != 0) {
i_debug("%s: Seen flag set", EVENT_NAME);
}
- if (data->flags_set & MAIL_DRAFT) {
+ if ((data->flags_set & MAIL_DRAFT) != 0) {
i_debug("%s: Draft flag set", EVENT_NAME);
}
flags = mail_get_flags(mail);
for (i = 0; i < N_ELEMENTS(flag_check_always); i++) {
- if ((flags & flag_check_always[i]) &&
- !(old_flags & flag_check_always[i])) {
+ if ((flags & flag_check_always[i]) != 0 &&
+ (old_flags & flag_check_always[i]) == 0) {
flags_set |= flag_check_always[i];
}
}
if (!config->hide_deleted &&
- (flags & MAIL_DELETED) &&
- !(old_flags & MAIL_DELETED)) {
+ (flags & MAIL_DELETED) != 0 &&
+ (old_flags & MAIL_DELETED) == 0) {
flags_set |= MAIL_DELETED;
}
if (!config->hide_seen &&
- (flags & MAIL_SEEN) &&
- !(old_flags & MAIL_SEEN)) {
+ (flags & MAIL_SEEN) != 0 &&
+ (old_flags & MAIL_SEEN) == 0) {
flags_set |= MAIL_SEEN;
}
/* Only create data element if at least one flag was set. */
- if (flags_set) {
+ if (flags_set != 0) {
data = push_notification_event_flagsset_get_data(ptxn, msg, ec);
data->flags_set |= flags_set;
}
struct push_notification_event_messageappend_data *data;
const char *value;
- if (!config->flags) {
+ if (config->flags == 0) {
return;
}
}
if ((data->to == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_TO) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_TO) != 0 &&
(mail_get_first_header(mail, "To", &value) >= 0)) {
data->to = p_strdup(ptxn->pool, value);
}
if ((data->from == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_FROM) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_FROM) != 0 &&
(mail_get_first_header(mail, "From", &value) >= 0)) {
data->from = p_strdup(ptxn->pool, value);
}
if ((data->subject == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_SUBJECT) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_SUBJECT) != 0 &&
(mail_get_first_header(mail, "Subject", &value) >= 0)) {
data->subject = p_strdup(ptxn->pool, value);
}
if ((data->snippet == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_BODY_SNIPPET) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_BODY_SNIPPET) != 0 &&
(mail_get_special(mail, MAIL_FETCH_BODY_SNIPPET, &value) >= 0)) {
/* [0] contains the snippet algorithm, skip over it */
i_assert(value[0] != '\0');
int tz;
const char *value;
- if (!config->flags) {
+ if (config->flags == 0) {
return;
}
}
if ((data->to == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_TO) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_TO) != 0 &&
(mail_get_first_header(mail, "To", &value) >= 0)) {
data->to = p_strdup(ptxn->pool, value);
}
if ((data->from == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_FROM) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_FROM) != 0 &&
(mail_get_first_header(mail, "From", &value) >= 0)) {
data->from = p_strdup(ptxn->pool, value);
}
if ((data->subject == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_SUBJECT) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_SUBJECT) != 0 &&
(mail_get_first_header(mail, "Subject", &value) >= 0)) {
data->subject = p_strdup(ptxn->pool, value);
}
if ((data->date == -1) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_DATE) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_HDR_DATE) != 0 &&
(mail_get_date(mail, &date, &tz) >= 0)) {
data->date = date;
data->date_tz = tz;
}
if ((data->snippet == NULL) &&
- (config->flags & PUSH_NOTIFICATION_MESSAGE_BODY_SNIPPET) &&
+ (config->flags & PUSH_NOTIFICATION_MESSAGE_BODY_SNIPPET) != 0 &&
(mail_get_special(mail, MAIL_FETCH_BODY_SNIPPET, &value) >= 0)) {
/* [0] contains the snippet algorithm, skip over it */
i_assert(value[0] != '\0');
/* If data struct exists, that means the read flag was changed. */
data = push_notification_txn_msg_get_eventdata(msg, EVENT_NAME);
- if ((data == NULL) && !(old_flags & MAIL_SEEN)) {
+ if ((data == NULL) && (old_flags & MAIL_SEEN) == 0) {
flags = mail_get_flags(mail);
- if (flags & MAIL_SEEN) {
+ if ((flags & MAIL_SEEN) != 0) {
data = p_new(ptxn->pool,
struct push_notification_event_messageread_data, 1);
data->read = TRUE;
/* If data struct exists, that means the deleted flag was changed. */
data = push_notification_txn_msg_get_eventdata(msg, EVENT_NAME);
- if ((data == NULL) && !(old_flags & MAIL_DELETED)) {
+ if ((data == NULL) && (old_flags & MAIL_DELETED) == 0) {
flags = mail_get_flags(mail);
- if (flags & MAIL_DELETED) {
+ if ((flags & MAIL_DELETED) != 0) {
data = p_new(ptxn->pool,
struct push_notification_event_messagetrash_data, 1);
data->trash = TRUE;
push_notification_transaction_init(ptxn);
/* POST_SESSION means MTA delivery. */
- if (mail->box->flags & MAILBOX_FLAG_POST_SESSION) {
+ if ((mail->box->flags & MAILBOX_FLAG_POST_SESSION) != 0) {
push_notification_trigger_msg_save_new(ptxn, mail, NULL);
} else {
push_notification_trigger_msg_save_append(ptxn, mail, NULL);
echo '#include <rpc/rpc.h>'; \
$(RPCGEN) -c $(top_builddir)/src/plugins/quota/rquota.x | \
sed -e 's/IXDR_PUT/(void)IXDR_PUT/g' \
+ -e 's,!xdr_,0 == xdr_,' \
-e 's,/usr/include/rpcsvc/rquota.h,rquota.h,' \
-e 's/int32_t \*buf/int32_t *buf ATTR_UNUSED/' \
-e 's/^static char rcsid.*//' ) > rquota_xdr.c
new_hash ^= crc32_str(client->message_uidls[i]);
} else {
for (i = 0, new_hash = 0; i < client->messages_count; i++) {
- if (client->deleted_bitmask[i / CHAR_BIT] &
- (1 << (i % CHAR_BIT)))
+ if ((client->deleted_bitmask[i / CHAR_BIT] &
+ (1 << (i % CHAR_BIT))) != 0)
continue;
new_hash ^= crc32_str(client->message_uidls[i]);
}
num--;
if (client->deleted) {
- if (client->deleted_bitmask[num / CHAR_BIT] &
- (1 << (num % CHAR_BIT))) {
+ if ((client->deleted_bitmask[num / CHAR_BIT] &
+ (1 << (num % CHAR_BIT))) != 0) {
client_send_line(client, "-ERR Message is deleted.");
return NULL;
}
}
if (client->deleted) {
- if (client->deleted_bitmask[ctx->msgnum / CHAR_BIT] &
- (1 << (ctx->msgnum % CHAR_BIT)))
+ if ((client->deleted_bitmask[ctx->msgnum / CHAR_BIT] &
+ (1 << (ctx->msgnum % CHAR_BIT))) != 0)
continue;
}
uint32_t msgnum = ctx->msgnum++;
if (client->deleted) {
- if (client->deleted_bitmask[msgnum / CHAR_BIT] &
- (1 << (msgnum % CHAR_BIT)))
+ if ((client->deleted_bitmask[msgnum / CHAR_BIT] &
+ (1 << (msgnum % CHAR_BIT))) != 0)
continue;
}
found = TRUE;
break;
}
if (client->deleted) {
- if (client->deleted_bitmask[msgnum / CHAR_BIT] &
- (1 << (msgnum % CHAR_BIT)))
+ if ((client->deleted_bitmask[msgnum / CHAR_BIT] &
+ (1 << (msgnum % CHAR_BIT))) != 0)
continue;
}
found = TRUE;
projects / thirdparty / dovecot / core.git / commitdiff
