debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: replace some constructs with more uncrustify friendly ones

Browse source 
In particular
   - use (bool) instead of !!
   - cuddle the opening parens of function calls
   - add parens in some ternery operators
This commit is contained in:
David Bremner 2019-06-12 19:47:20 -03:00
parent bcfd3e7542
commit be8f0ba92a
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
command-line-arguments.c
View file

@ -78,7 +78,7 @@ _process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next,
return OPT_FAILED; return OPT_FAILED;
} }
*arg_desc->opt_bool = negate ? !value : value; *arg_desc->opt_bool = negate ? (! value) : value;
return OPT_OK; return OPT_OK;
} }
@ -120,13 +120,13 @@ _process_string_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *
static int _opt_set_count (const notmuch_opt_desc_t *opt_desc) static int _opt_set_count (const notmuch_opt_desc_t *opt_desc)
{ {
return return
!!opt_desc->opt_inherit + (bool) opt_desc->opt_inherit +
!!opt_desc->opt_bool + (bool) opt_desc->opt_bool +
!!opt_desc->opt_int + (bool) opt_desc->opt_int +
!!opt_desc->opt_keyword + (bool) opt_desc->opt_keyword +
!!opt_desc->opt_flags + (bool) opt_desc->opt_flags +
!!opt_desc->opt_string + (bool) opt_desc->opt_string +
!!opt_desc->opt_position; (bool) opt_desc->opt_position;
} }
/* Return true if opt_desc is valid. */ /* Return true if opt_desc is valid. */

8
mime-node.c
View file

@ -185,8 +185,8 @@ node_verify (mime_node_t *node, GMimeObject *part)
notmuch_status_t status; notmuch_status_t status;
node->verify_attempted = true; node->verify_attempted = true;
node->sig_list = g_mime_multipart_signed_verify node->sig_list = g_mime_multipart_signed_verify (
(GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err); GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err);
if (node->sig_list) if (node->sig_list)
set_signature_list_destructor (node); set_signature_list_destructor (node);
@ -342,8 +342,8 @@ mime_node_child (mime_node_t *parent, int child)
if (child == GMIME_MULTIPART_ENCRYPTED_CONTENT && parent->decrypted_child) if (child == GMIME_MULTIPART_ENCRYPTED_CONTENT && parent->decrypted_child)
sub = parent->decrypted_child; sub = parent->decrypted_child;
else else
sub = g_mime_multipart_get_part sub = g_mime_multipart_get_part (
(GMIME_MULTIPART (parent->part), child); GMIME_MULTIPART (parent->part), child);
} else if (GMIME_IS_MESSAGE (parent->part)) { } else if (GMIME_IS_MESSAGE (parent->part)) {
sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part)); sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part));
} else { } else {

4
notmuch-search.c
View file

@ -752,8 +752,8 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar
size_t search_exclude_tags_length; size_t search_exclude_tags_length;
notmuch_status_t status; notmuch_status_t status;
search_exclude_tags = notmuch_config_get_search_exclude_tags search_exclude_tags = notmuch_config_get_search_exclude_tags (
(config, &search_exclude_tags_length); config, &search_exclude_tags_length);
for (i = 0; i < search_exclude_tags_length; i++) { for (i = 0; i < search_exclude_tags_length; i++) {
status = notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]); status = notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]);

16
notmuch-show.c
View file

@ -490,8 +490,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
{ {
/* The disposition and content-type metadata are associated with /* The disposition and content-type metadata are associated with
* the envelope for message parts */ * the envelope for message parts */
GMimeObject *meta = node->envelope_part ? GMimeObject *meta = node->envelope_part ? (
GMIME_OBJECT (node->envelope_part) : node->part; GMIME_OBJECT (node->envelope_part) ) : node->part ;
GMimeContentType *content_type = g_mime_object_get_content_type (meta); GMimeContentType *content_type = g_mime_object_get_content_type (meta);
const bool leaf = GMIME_IS_PART (node->part); const bool leaf = GMIME_IS_PART (node->part);
GMimeStream *stream = params->out_stream; GMimeStream *stream = params->out_stream;
@ -513,8 +513,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
char *content_string; char *content_string;
const char *disposition = _get_disposition (meta); const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta); const char *cid = g_mime_object_get_content_id (meta);
const char *filename = leaf ? const char *filename = leaf ? (
g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; g_mime_part_get_filename (GMIME_PART (node->part)) ) : NULL ;
if (disposition && if (disposition &&
strcasecmp (disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) strcasecmp (disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
@ -688,14 +688,14 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
/* The disposition and content-type metadata are associated with /* The disposition and content-type metadata are associated with
* the envelope for message parts */ * the envelope for message parts */
GMimeObject *meta = node->envelope_part ? GMimeObject *meta = node->envelope_part ? (
GMIME_OBJECT (node->envelope_part) : node->part; GMIME_OBJECT (node->envelope_part) ): node->part;
GMimeContentType *content_type = g_mime_object_get_content_type (meta); GMimeContentType *content_type = g_mime_object_get_content_type (meta);
char *content_string; char *content_string;
const char *disposition = _get_disposition (meta); const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta); const char *cid = g_mime_object_get_content_id (meta);
const char *filename = GMIME_IS_PART (node->part) ? const char *filename = GMIME_IS_PART (node->part) ? (
g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; g_mime_part_get_filename (GMIME_PART (node->part) ) ) : NULL;
int nclose = 0; int nclose = 0;
int i; int i;