From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sFcCHi9aS2BbDAAA0tVLHw (envelope-from ) for ; Fri, 12 Mar 2021 12:10:23 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EM/FGS9aS2BtewAAB5/wlQ (envelope-from ) for ; Fri, 12 Mar 2021 12:10:23 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 053151E41D for ; Fri, 12 Mar 2021 13:10:23 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 04EA82757D; Fri, 12 Mar 2021 07:10:07 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 9214727567 for ; Fri, 12 Mar 2021 07:10:01 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 890525FA96; Fri, 12 Mar 2021 07:10:01 -0500 (EST) Received: (nullmailer pid 2712830 invoked by uid 1000); Fri, 12 Mar 2021 12:09:58 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: uncrustify Subject: [PATCH 2/4] util: run uncrustify Date: Fri, 12 Mar 2021 08:09:53 -0400 Message-Id: <20210312120955.2712730-3-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312120955.2712730-1-david@tethera.net> References: <20210312120955.2712730-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: DW4MMLAG5KV42BJDX5JLZDZ2EYB5OOXE X-Message-ID-Hash: DW4MMLAG5KV42BJDX5JLZDZ2EYB5OOXE X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615551023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nx4sgtOH4Szvr+ma8g0Zc0uNaQMI9Ev7R4qZJKxOCdw=; b=OBnZW1HBeusl03D8s6OXCvfjg8Ny3Bl6Pt1sxKXZ0EkuCRukIMm3Bc/jeQZGkC6W5wwoIR ZrgWK0RQsDXLOkzWqnsay1oRcjieeXgEQXmeXAr+xDZWgvQYmXFne0Zb5wjZ/wpID4PtmF iWjn9Ubx81FLrqI63GP3sFWGCb0WS1Xdr69tX4PuVbwlFCBOha5+9/EcdmNLCC+vG/+C4c E1tbwWXHH3rR8qZ7UOQG0PBXUFVyzF5SqUNJQDws4jConMJKSWM/hKlpMNFiEHxvkbqWRv NtMyv4jSCnfJE92sn2mdR+SRkeUxrArqEyuX83l7KhF7DaVeMe0UN07HKnctUg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615551023; a=rsa-sha256; cv=none; b=g6YHH8lVhKCqRGsE/QpKPQ/oJo4+OXfhwiYo7cc+lCQLsOW+hYjDZVAQZrUjrGYzW8I1hd F6Dg4akRKoUMiJTnTpoFhzcZMM8oLWItkeN3Y63sgSTULAE76UAKpVXZqiq3WoMOZATr5g 6tcn4ZS7jpDpa78ZciI3NvzKz2AaqR6JQdxeb6hz+oFfS9hGtbT1AlxCTPITkfO0Iox8cP 0cdhBKSC/mCnit6Jk8uM3Y2wUKvfLjr0j0tC55+G/jIVU1h+x7Nx7B1w7v9s5QISPPysNt Efsvl+Tg3w2gBqwEzZR044VsvfU70rKbsIykZqus7M7UGnhj19CJr0caE5lGvg== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.99 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 053151E41D X-Spam-Score: -0.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: Mn6l4//2alyn From: uncrustify This is the result of running $ uncrustify --replace --config ../devel/uncrustify.cfg *.c *.h in the util directory --- util/crypto.c | 18 ++++++++++++------ util/crypto.h | 6 ++++-- util/gmime-extra.c | 1 + util/repair.c | 14 ++++++++------ util/string-util.c | 3 ++- util/zlib-extra.c | 3 ++- util/zlib-extra.h | 2 +- 7 files changed, 30 insertions(+), 17 deletions(-) diff --git a/util/crypto.c b/util/crypto.c index c09f467b..156a6550 100644 --- a/util/crypto.c +++ b/util/crypto.c @@ -48,7 +48,8 @@ _notmuch_crypto_decrypt (bool *attempted, notmuch_message_properties_t *list = NULL; for (list = notmuch_message_get_properties (message, "session-key", TRUE); - notmuch_message_properties_valid (list); notmuch_message_properties_move_to_next (list)) { + notmuch_message_properties_valid (list); notmuch_message_properties_move_to_next ( + list)) { if (err && *err) { g_error_free (*err); *err = NULL; @@ -61,12 +62,13 @@ _notmuch_crypto_decrypt (bool *attempted, notmuch_message_properties_value (list), decrypt_result, err); } else if (GMIME_IS_APPLICATION_PKCS7_MIME (part)) { - GMimeApplicationPkcs7Mime *pkcs7 = GMIME_APPLICATION_PKCS7_MIME (part); + GMimeApplicationPkcs7Mime *pkcs7 = GMIME_APPLICATION_PKCS7_MIME (part); GMimeSecureMimeType type = g_mime_application_pkcs7_mime_get_smime_type (pkcs7); if (type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) { ret = g_mime_application_pkcs7_mime_decrypt (pkcs7, GMIME_DECRYPT_NONE, - notmuch_message_properties_value (list), + notmuch_message_properties_value ( + list), decrypt_result, err); } } @@ -90,6 +92,7 @@ _notmuch_crypto_decrypt (bool *attempted, if (attempted) *attempted = true; GMimeDecryptFlags flags = GMIME_DECRYPT_NONE; + if (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result) flags |= GMIME_DECRYPT_EXPORT_SESSION_KEY; if (GMIME_IS_MULTIPART_ENCRYPTED (part)) { @@ -128,7 +131,8 @@ _notmuch_message_crypto_new (void *ctx) } notmuch_status_t -_notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypto, GMimeSignatureList *sigs) +_notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypto, + GMimeSignatureList *sigs) { if (! msg_crypto) return NOTMUCH_STATUS_NULL_POINTER; @@ -157,7 +161,8 @@ _notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypt bool -_notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto, GMimeObject *part, GMimeObject *parent, int childnum) +_notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto, GMimeObject *part, + GMimeObject *parent, int childnum) { const char *protected_headers = NULL; const char *forwarded = NULL; @@ -175,7 +180,8 @@ _notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto * encryption protocol should be "control information" metadata, * not payload. So we skip it. (see * https://tools.ietf.org/html/rfc1847#page-8) */ - if (parent && GMIME_IS_MULTIPART_ENCRYPTED (parent) && childnum == GMIME_MULTIPART_ENCRYPTED_VERSION) { + if (parent && GMIME_IS_MULTIPART_ENCRYPTED (parent) && childnum == + GMIME_MULTIPART_ENCRYPTED_VERSION) { const char *enc_type = g_mime_object_get_content_type_parameter (parent, "protocol"); GMimeContentType *ct = g_mime_object_get_content_type (part); if (ct && enc_type) { diff --git a/util/crypto.h b/util/crypto.h index 4fa5599c..3c5d384b 100644 --- a/util/crypto.h +++ b/util/crypto.h @@ -80,7 +80,8 @@ _notmuch_message_crypto_new (void *ctx); * consider a particular signature as relevant for the message. */ notmuch_status_t -_notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypto, GMimeSignatureList *sigs); +_notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypto, + GMimeSignatureList *sigs); /* call successful_decryption during a depth-first-search on a message * to indicate that a part was successfully decrypted. @@ -95,7 +96,8 @@ _notmuch_message_crypto_successful_decryption (_notmuch_message_crypto_t *msg_cr * this message. */ bool -_notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto, GMimeObject *part, GMimeObject *parent, int childnum); +_notmuch_message_crypto_potential_payload (_notmuch_message_crypto_t *msg_crypto, GMimeObject *part, + GMimeObject *parent, int childnum); #ifdef __cplusplus diff --git a/util/gmime-extra.c b/util/gmime-extra.c index 04d8ed3d..81a5b174 100644 --- a/util/gmime-extra.c +++ b/util/gmime-extra.c @@ -101,6 +101,7 @@ g_mime_certificate_get_valid_userid (GMimeCertificate *cert) if (uid == NULL) return uid; GMimeValidity validity = g_mime_certificate_get_id_validity (cert); + if (validity == GMIME_VALIDITY_FULL || validity == GMIME_VALIDITY_ULTIMATE) return uid; return NULL; diff --git a/util/repair.c b/util/repair.c index 5a64e001..5b0dfdf4 100644 --- a/util/repair.c +++ b/util/repair.c @@ -32,7 +32,8 @@ _notmuch_crypto_payload_has_legacy_display (GMimeObject *payload) if (! g_mime_content_type_is_type (g_mime_object_get_content_type (payload), "multipart", "mixed")) return false; - protected_header_parameter = g_mime_object_get_content_type_parameter (payload, "protected-headers"); + protected_header_parameter = g_mime_object_get_content_type_parameter (payload, + "protected-headers"); if ((! protected_header_parameter) || strcmp (protected_header_parameter, "v1")) return false; if (! GMIME_IS_MULTIPART (payload)) @@ -44,15 +45,16 @@ _notmuch_crypto_payload_has_legacy_display (GMimeObject *payload) return false; first = g_mime_multipart_get_part (mpayload, 0); /* Early implementations that generated "Legacy Display" parts used - Content-Type: text/rfc822-headers, but text/plain is more widely - rendered, so it is now the standard choice. We accept either as a - Legacy Display part. */ + * Content-Type: text/rfc822-headers, but text/plain is more widely + * rendered, so it is now the standard choice. We accept either as a + * Legacy Display part. */ if (! (g_mime_content_type_is_type (g_mime_object_get_content_type (first), "text", "plain") || g_mime_content_type_is_type (g_mime_object_get_content_type (first), "text", "rfc822-headers"))) return false; - protected_header_parameter = g_mime_object_get_content_type_parameter (first, "protected-headers"); + protected_header_parameter = g_mime_object_get_content_type_parameter (first, + "protected-headers"); if ((! protected_header_parameter) || strcmp (protected_header_parameter, "v1")) return false; if (! GMIME_IS_TEXT_PART (first)) @@ -77,7 +79,7 @@ static bool _notmuch_is_mixed_up_mangled (GMimeObject *part) { GMimeMultipart *mpart = NULL; - GMimeObject *parts[3] = {NULL, NULL, NULL}; + GMimeObject *parts[3] = { NULL, NULL, NULL }; GMimeContentType *type = NULL; char *prelude_string = NULL; bool prelude_is_empty; diff --git a/util/string-util.c b/util/string-util.c index 27f8a26b..9c46a81a 100644 --- a/util/string-util.c +++ b/util/string-util.c @@ -53,7 +53,7 @@ strsplit_len (const char *s, char delim, size_t *len) count++; } - if (count==0) + if (count == 0) return NULL; *len = count; @@ -183,6 +183,7 @@ parse_boolean_term (void *ctx, const char *str, /* Parse prefix */ str = skip_space (str); const char *pos = strchr (str, ':'); + if (! pos || pos == str) goto FAIL; *prefix_out = talloc_strndup (ctx, str, pos - str); diff --git a/util/zlib-extra.c b/util/zlib-extra.c index 3a75e504..1f5f9dbe 100644 --- a/util/zlib-extra.c +++ b/util/zlib-extra.c @@ -87,8 +87,9 @@ gz_error_string (util_status_t status, gzFile file) } const char * -gzerror_str(gzFile file) +gzerror_str (gzFile file) { int dummy; + return gzerror (file, &dummy); } diff --git a/util/zlib-extra.h b/util/zlib-extra.h index e9925c98..7532339b 100644 --- a/util/zlib-extra.h +++ b/util/zlib-extra.h @@ -30,7 +30,7 @@ gz_error_string (util_status_t status, gzFile stream); /* Call gzerror with a dummy errno argument, the docs don't promise to * support the NULL case */ const char * -gzerror_str(gzFile file); +gzerror_str (gzFile file); #ifdef __cplusplus } -- 2.30.1