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

util: run uncrustify

Browse source 
This is the result of running

     $ uncrustify --replace --config ../devel/uncrustify.cfg *.c *.h

in the util directory
This commit is contained in:
uncrustify 2021-03-13 08:45:34 -04:00 committed by David Bremner
parent 8aeba1228a
commit 0756d25872
7 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
util/crypto.c
View file

@ -48,7 +48,8 @@ _notmuch_crypto_decrypt (bool *attempted,
notmuch_message_properties_t *list = NULL; notmuch_message_properties_t *list = NULL;
for (list = notmuch_message_get_properties (message, "session-key", TRUE); 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) { if (err && *err) {
g_error_free (*err); g_error_free (*err);
*err = NULL; *err = NULL;
@ -61,12 +62,13 @@ _notmuch_crypto_decrypt (bool *attempted,
notmuch_message_properties_value (list), notmuch_message_properties_value (list),
decrypt_result, err); decrypt_result, err);
} else if (GMIME_IS_APPLICATION_PKCS7_MIME (part)) { } 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); GMimeSecureMimeType type = g_mime_application_pkcs7_mime_get_smime_type (pkcs7);
if (type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) { if (type == GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA) {
ret = g_mime_application_pkcs7_mime_decrypt (pkcs7, ret = g_mime_application_pkcs7_mime_decrypt (pkcs7,
GMIME_DECRYPT_NONE, GMIME_DECRYPT_NONE,
notmuch_message_properties_value (list), notmuch_message_properties_value (
list),
decrypt_result, err); decrypt_result, err);
} }
} }
@ -90,6 +92,7 @@ _notmuch_crypto_decrypt (bool *attempted,
if (attempted) if (attempted)
*attempted = true; *attempted = true;
GMimeDecryptFlags flags = GMIME_DECRYPT_NONE; GMimeDecryptFlags flags = GMIME_DECRYPT_NONE;
if (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result) if (decrypt == NOTMUCH_DECRYPT_TRUE && decrypt_result)
flags |= GMIME_DECRYPT_EXPORT_SESSION_KEY; flags |= GMIME_DECRYPT_EXPORT_SESSION_KEY;
if (GMIME_IS_MULTIPART_ENCRYPTED (part)) { if (GMIME_IS_MULTIPART_ENCRYPTED (part)) {
@ -128,7 +131,8 @@ _notmuch_message_crypto_new (void *ctx)
} }
notmuch_status_t 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) if (! msg_crypto)
return NOTMUCH_STATUS_NULL_POINTER; return NOTMUCH_STATUS_NULL_POINTER;
@ -157,7 +161,8 @@ _notmuch_message_crypto_potential_sig_list (_notmuch_message_crypto_t *msg_crypt
bool 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 *protected_headers = NULL;
const char *forwarded = 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, * encryption protocol should be "control information" metadata,
* not payload. So we skip it. (see * not payload. So we skip it. (see
* https://tools.ietf.org/html/rfc1847#page-8) */ * 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"); const char *enc_type = g_mime_object_get_content_type_parameter (parent, "protocol");
GMimeContentType *ct = g_mime_object_get_content_type (part); GMimeContentType *ct = g_mime_object_get_content_type (part);
if (ct && enc_type) { if (ct && enc_type) {

6
util/crypto.h
View file

@ -80,7 +80,8 @@ _notmuch_message_crypto_new (void *ctx);
* consider a particular signature as relevant for the message. * consider a particular signature as relevant for the message.
*/ */
notmuch_status_t 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 /* call successful_decryption during a depth-first-search on a message
* to indicate that a part was successfully decrypted. * 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. * this message.
*/ */
bool 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 #ifdef __cplusplus

1
util/gmime-extra.c
View file

@ -101,6 +101,7 @@ g_mime_certificate_get_valid_userid (GMimeCertificate *cert)
if (uid == NULL) if (uid == NULL)
return uid; return uid;
GMimeValidity validity = g_mime_certificate_get_id_validity (cert); GMimeValidity validity = g_mime_certificate_get_id_validity (cert);
if (validity == GMIME_VALIDITY_FULL || validity == GMIME_VALIDITY_ULTIMATE) if (validity == GMIME_VALIDITY_FULL || validity == GMIME_VALIDITY_ULTIMATE)
return uid; return uid;
return NULL; return NULL;

14
util/repair.c
View file

@ -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), if (! g_mime_content_type_is_type (g_mime_object_get_content_type (payload),
"multipart", "mixed")) "multipart", "mixed"))
return false; 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")) if ((! protected_header_parameter) || strcmp (protected_header_parameter, "v1"))
return false; return false;
if (! GMIME_IS_MULTIPART (payload)) if (! GMIME_IS_MULTIPART (payload))
@ -44,15 +45,16 @@ _notmuch_crypto_payload_has_legacy_display (GMimeObject *payload)
return false; return false;
first = g_mime_multipart_get_part (mpayload, 0); first = g_mime_multipart_get_part (mpayload, 0);
/* Early implementations that generated "Legacy Display" parts used /* Early implementations that generated "Legacy Display" parts used
Content-Type: text/rfc822-headers, but text/plain is more widely * Content-Type: text/rfc822-headers, but text/plain is more widely
rendered, so it is now the standard choice. We accept either as a * rendered, so it is now the standard choice. We accept either as a
Legacy Display part. */ * Legacy Display part. */
if (! (g_mime_content_type_is_type (g_mime_object_get_content_type (first), if (! (g_mime_content_type_is_type (g_mime_object_get_content_type (first),
"text", "plain") || "text", "plain") ||
g_mime_content_type_is_type (g_mime_object_get_content_type (first), g_mime_content_type_is_type (g_mime_object_get_content_type (first),
"text", "rfc822-headers"))) "text", "rfc822-headers")))
return false; 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")) if ((! protected_header_parameter) || strcmp (protected_header_parameter, "v1"))
return false; return false;
if (! GMIME_IS_TEXT_PART (first)) if (! GMIME_IS_TEXT_PART (first))
@ -77,7 +79,7 @@ static bool
_notmuch_is_mixed_up_mangled (GMimeObject *part) _notmuch_is_mixed_up_mangled (GMimeObject *part)
{ {
GMimeMultipart *mpart = NULL; GMimeMultipart *mpart = NULL;
GMimeObject *parts[3] = {NULL, NULL, NULL}; GMimeObject *parts[3] = { NULL, NULL, NULL };
GMimeContentType *type = NULL; GMimeContentType *type = NULL;
char *prelude_string = NULL; char *prelude_string = NULL;
bool prelude_is_empty; bool prelude_is_empty;

3
util/string-util.c
View file

@ -53,7 +53,7 @@ strsplit_len (const char *s, char delim, size_t *len)
count++; count++;
} }
if (count==0) if (count == 0)
return NULL; return NULL;
*len = count; *len = count;
@ -183,6 +183,7 @@ parse_boolean_term (void *ctx, const char *str,
/* Parse prefix */ /* Parse prefix */
str = skip_space (str); str = skip_space (str);
const char *pos = strchr (str, ':'); const char *pos = strchr (str, ':');
if (! pos || pos == str) if (! pos || pos == str)
goto FAIL; goto FAIL;
*prefix_out = talloc_strndup (ctx, str, pos - str); *prefix_out = talloc_strndup (ctx, str, pos - str);

3
util/zlib-extra.c
View file

@ -87,8 +87,9 @@ gz_error_string (util_status_t status, gzFile file)
} }
const char * const char *
gzerror_str(gzFile file) gzerror_str (gzFile file)
{ {
int dummy; int dummy;
return gzerror (file, &dummy); return gzerror (file, &dummy);
} }

2
util/zlib-extra.h
View file

@ -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 /* Call gzerror with a dummy errno argument, the docs don't promise to
* support the NULL case */ * support the NULL case */
const char * const char *
gzerror_str(gzFile file); gzerror_str (gzFile file);
#ifdef __cplusplus #ifdef __cplusplus
} }