From 5abdec8191cea8dc409911fed1be00c2eb136388 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Fri, 23 Mar 2018 12:58:38 +0000 Subject: [PATCH] tidy - clang-format - sort makefile lists - tidy whitespace --- Makefile.autosetup | 37 +++++----- alias.c | 2 +- auto.def | 4 +- bcache.c | 3 +- conn/conn_globals.c | 10 +-- contrib/gpg.rc | 6 +- copy.c | 1 - curs_main.c | 1 - doc/manual.xml.head | 14 ++-- doc/mbox.5 | 4 +- doc/neomuttrc.man.head | 2 +- doxygen/layout.xml | 2 +- e1 | 150 ---------------------------------------- handler.c | 2 +- help.c | 2 +- imap/imap.c | 4 +- init.c | 30 ++++---- keymap.c | 3 +- mutt_logging.c | 9 ++- mutt_notmuch.c | 5 +- po/pt_BR.po | 2 +- recvattach.c | 3 +- test/Makefile.autosetup | 2 +- test/rfc2047.c | 2 +- 24 files changed, 72 insertions(+), 228 deletions(-) delete mode 100644 e1 diff --git a/Makefile.autosetup b/Makefile.autosetup index 55552db55..7d17bc473 100644 --- a/Makefile.autosetup +++ b/Makefile.autosetup @@ -59,20 +59,18 @@ ALL_FILES!= (cd $(SRCDIR) && git ls-files 2>/dev/null) || true ############################################################################### # neomutt NEOMUTT= neomutt$(EXEEXT) -NEOMUTTOBJS= mutt_account.o addrbook.o alias.o attach.o bcache.o body.o \ - browser.o buffy.o color.o commands.o complete.o \ - compose.o compress.o conststrings.o copy.o curs_lib.o \ - curs_main.o edit.o editmsg.o enter.o envelope.o filter.o \ - flags.o from.o group.o handler.o hdrline.o \ - header.o help.o history.o hook.o init.o keymap.o mutt_logging.o main.o \ - mbox.o menu.o mh.o muttlib.o \ - mutt_socket.o tags.o mx.o \ - newsrc.o nntp.o pager.o parse.o pattern.o pop.o \ - pop_auth.o pop_lib.o postpone.o query.o recvattach.o recvcmd.o \ - rfc1524.o rfc2047.o rfc2231.o rfc3676.o \ - safe_asprintf.o score.o send.o sendlib.o sidebar.o mutt_signal.o \ - resize.o smtp.o sort.o state.o status.o system.o thread.o url.o \ - version.o +NEOMUTTOBJS= addrbook.o alias.o attach.o bcache.o body.o browser.o buffy.o \ + color.o commands.o complete.o compose.o compress.o \ + conststrings.o copy.o curs_lib.o curs_main.o edit.o editmsg.o \ + enter.o envelope.o filter.o flags.o from.o group.o handler.o \ + hdrline.o header.o help.o history.o hook.o init.o keymap.o \ + main.o mbox.o menu.o mh.o muttlib.o mutt_account.o \ + mutt_logging.o mutt_signal.o mutt_socket.o mx.o newsrc.o \ + nntp.o pager.o parse.o pattern.o pop.o pop_auth.o pop_lib.o \ + postpone.o query.o recvattach.o recvcmd.o resize.o rfc1524.o \ + rfc2047.o rfc2231.o rfc3676.o safe_asprintf.o score.o send.o \ + sendlib.o sidebar.o smtp.o sort.o state.o status.o system.o \ + tags.o thread.o url.o version.o @if !HAVE_WCSCASECMP NEOMUTTOBJS+= wcscasecmp.o @@ -93,12 +91,11 @@ ALLOBJS+= $(NEOMUTTOBJS) # libmutt LIBMUTT= libmutt.a LIBMUTTOBJS= mutt/address.o mutt/base64.o mutt/buffer.o mutt/charset.o \ - mutt/date.o mutt/exit.o \ - mutt/file.o mutt/hash.o mutt/idna.o mutt/list.o mutt/logging.o \ - mutt/mapping.o mutt/mbyte.o mutt/md5.o \ - mutt/memory.o mutt/mime.o mutt/parameter.o \ - mutt/regex.o mutt/sha1.o mutt/signal.o mutt/string.o \ - mutt/rfc2047.o + mutt/date.o mutt/exit.o mutt/file.o mutt/hash.o mutt/idna.o \ + mutt/list.o mutt/logging.o mutt/mapping.o mutt/mbyte.o \ + mutt/md5.o mutt/memory.o mutt/mime.o mutt/parameter.o \ + mutt/regex.o mutt/rfc2047.o mutt/sha1.o mutt/signal.o \ + mutt/string.o CLEANFILES+= $(LIBMUTT) $(LIBMUTTOBJS) MUTTLIBS+= $(LIBMUTT) ALLOBJS+= $(LIBMUTTOBJS) diff --git a/alias.c b/alias.c index 08cc4953a..4f41ac28e 100644 --- a/alias.c +++ b/alias.c @@ -250,7 +250,7 @@ int check_alias_name(const char *s, char *dest, size_t destlen) s += l, destlen -= l) { int bad = l == (size_t)(-1) || l == (size_t)(-2); /* conversion error */ - bad = bad || (!dry && l > destlen); /* too few room for mb char */ + bad = bad || (!dry && l > destlen); /* too few room for mb char */ if (l == 1) bad = bad || (strchr("-_+=.", *s) == NULL && !iswalnum(wc)); else diff --git a/auto.def b/auto.def index 1490595fd..ae89a36cd 100644 --- a/auto.def +++ b/auto.def @@ -110,7 +110,7 @@ if {1} { # relative --enable-opt to true. This allows "--with-opt=/usr" to be used as # a shortcut for "--opt --with-opt=/usr". foreach opt { - bdb gdbm gnutls gpgme gss homespool idn kyotocabinet lmdb lua mixmaster + bdb gdbm gnutls gpgme gss homespool idn kyotocabinet lmdb lua mixmaster ncurses nls notmuch qdbm sasl slang ssl tokyocabinet } { if {[opt-val with-$opt] ne {}} { @@ -301,7 +301,7 @@ set prefix [opt-val with-sysroot][get-define prefix] ############################################################################### # Everything if {[get-define want-everything]} { - foreach opt {gpgme pgp smime notmuch lua tokyocabinet kyotocabinet bdb + foreach opt {gpgme pgp smime notmuch lua tokyocabinet kyotocabinet bdb gdbm qdbm lmdb} { define want-$opt append conf_options "--$opt " diff --git a/bcache.c b/bcache.c index 966a5cf9d..ca845a172 100644 --- a/bcache.c +++ b/bcache.c @@ -70,8 +70,7 @@ static int bcache_path(struct Account *account, const char *mailbox, char *dst, } size_t mailboxlen = mutt_str_strlen(mailbox); - len = snprintf(dst, dstlen - 1, "%s/%s%s%s", MessageCachedir, host, - NONULL(mailbox), + len = snprintf(dst, dstlen - 1, "%s/%s%s%s", MessageCachedir, host, NONULL(mailbox), (mailboxlen != 0 && mailbox[mailboxlen - 1] == '/') ? "" : "/"); mutt_encode_path(dst, dstlen, dst); diff --git a/conn/conn_globals.c b/conn/conn_globals.c index 525fb2d2c..ecbeda4be 100644 --- a/conn/conn_globals.c +++ b/conn/conn_globals.c @@ -33,16 +33,16 @@ short ConnectTimeout = 0; /**< Config: Timeout for a network connection (for IMA #ifdef USE_SSL const char *CertificateFile = NULL; /**< Config: File containing trusted certificates */ -const char *EntropyFile = NULL; /**< Config: File containing random data to initialise SSL */ -const char *SslCiphers = NULL; /**< Config: Ciphers to use when using SSL */ -const char *SslClientCert = NULL; /**< Config: File containing client certificates */ +const char *EntropyFile = NULL; /**< Config: File containing random data to initialise SSL */ +const char *SslCiphers = NULL; /**< Config: Ciphers to use when using SSL */ +const char *SslClientCert = NULL; /**< Config: File containing client certificates */ #ifdef USE_SSL_GNUTLS const char *SslCaCertificatesFile = NULL; /**< Config: File containing trusted CA certificates */ -short SslMinDhPrimeBits = 0; /**< Config: Minimum keysize for Diffie-Hellman key exchange */ +short SslMinDhPrimeBits = 0; /**< Config: Minimum keysize for Diffie-Hellman key exchange */ #endif #endif #ifdef USE_SOCKET const char *Preconnect = NULL; /**< Config: Shell command to run before making a connection */ -const char *Tunnel = NULL; /**< Config: Shell command to establish a tunnel */ +const char *Tunnel = NULL; /**< Config: Shell command to establish a tunnel */ #endif diff --git a/contrib/gpg.rc b/contrib/gpg.rc index 6f0e165b0..33f2f3fd2 100644 --- a/contrib/gpg.rc +++ b/contrib/gpg.rc @@ -88,7 +88,7 @@ set pgp_clearsign_command="gpg %?p?--pinentry-mode loopback --passphrase-fd 0? - set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f" # Create an encrypted and signed attachment (note that some users include the --always-trust option here) -# +# # set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" # set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --sign --encrypt -- --recipient %r -- %f" @@ -107,11 +107,11 @@ set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r" # Read in the public key ring # -set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r" +set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r" # Read in the secret key ring # -set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r" +set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r" # Fetch keys # set pgp_getkeys_command="pkspxycwrap %r" diff --git a/copy.c b/copy.c index 2f9530476..7df337705 100644 --- a/copy.c +++ b/copy.c @@ -376,7 +376,6 @@ int mutt_copy_hdr(FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, */ int mutt_copy_header(FILE *in, struct Header *h, FILE *out, int flags, const char *prefix) { - if (h->env) flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) | (h->env->refs_changed ? CH_UPDATE_REFS : 0); diff --git a/curs_main.c b/curs_main.c index e8221b650..1ebf1ef5e 100644 --- a/curs_main.c +++ b/curs_main.c @@ -237,7 +237,6 @@ static int ci_previous_undeleted(int msgno) */ static int ci_first_message(void) { - if (Context && Context->msgcount) { int old = -1; diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 051f1ed40..875ddecb9 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -2713,13 +2713,13 @@ color sidebar_divider color8 default Once you have successfully finished the key selection, the message will be encrypted using the selected public keys when sent out. - - To ensure you can view encrypted messages you have sent, you - may wish to set $pgp_self_encrypt - and $pgp_default_key for PGP, or - $smime_self_encrypt - and $smime_default_key for S/MIME. - + + To ensure you can view encrypted messages you have sent, you + may wish to set $pgp_self_encrypt + and $pgp_default_key for PGP, or + $smime_self_encrypt + and $smime_default_key for S/MIME. + Most fields of the entries in the key selection menu (see also $pgp_entry_format) have obvious meanings. But some explanations on the capabilities, flags, and diff --git a/doc/mbox.5 b/doc/mbox.5 index e83c48626..f5c58a3f4 100644 --- a/doc/mbox.5 +++ b/doc/mbox.5 @@ -3,8 +3,8 @@ .\" .\" Copyright (C) 2000 Thomas Roessler .\" -.\" This document is in the public domain and may be distributed and -.\" changed arbitrarily. +.\" This document is in the public domain and may be distributed and +.\" changed arbitrarily. .\" .TH mbox 5 "February 19th, 2002" Unix "User Manuals" .\" diff --git a/doc/neomuttrc.man.head b/doc/neomuttrc.man.head index cbedd6030..d78fe55ef 100644 --- a/doc/neomuttrc.man.head +++ b/doc/neomuttrc.man.head @@ -2,7 +2,7 @@ .\" -*-nroff-*- .\" .\" Copyright (C) 1996-2000 Michael R. Elkins -.\" Copyright (C) 1999-2000 Thomas Roessler +.\" Copyright (C) 1999-2000 Thomas Roessler .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff --git a/doxygen/layout.xml b/doxygen/layout.xml index 6c5ac6948..331a1e118 100644 --- a/doxygen/layout.xml +++ b/doxygen/layout.xml @@ -5,7 +5,7 @@ - + diff --git a/e1 b/e1 deleted file mode 100644 index 0b4cad91a..000000000 --- a/e1 +++ /dev/null @@ -1,150 +0,0 @@ -diff --git i/po/bg.po w/po/bg.po --msgid "null key sequence" --msgstr "празна последователност от клавиши" -+msgid "%s: null key sequence" -+msgstr "%s: празна последователност от клавиши" -diff --git i/po/ca.po w/po/ca.po --msgid "null key sequence" --msgstr "La seqüència de tecles és nul·la." -+msgid "%s: null key sequence" -+msgstr "%s: La seqüència de tecles és nul·la." -diff --git i/po/cs.po w/po/cs.po --msgid "null key sequence" --msgstr "prázdný sled kláves" -+msgid "%s: null key sequence" -+msgstr "%s: prázdný sled kláves" -diff --git i/po/da.po w/po/da.po --msgid "null key sequence" --msgstr "tom tastesekvens" -+msgid "%s: null key sequence" -+msgstr "%s: tom tastesekvens" -diff --git i/po/de.po w/po/de.po --msgid "null key sequence" --msgstr "Leere Tastenfolge" -+msgid "%s: null key sequence" -+msgstr "%s: Leere Tastenfolge" -diff --git i/po/el.po w/po/el.po --msgid "null key sequence" --msgstr "κενή ακολουθία πλήκτρων" -+msgid "%s: null key sequence" -+msgstr "%s: κενή ακολουθία πλήκτρων" -diff --git i/po/en_GB.po w/po/en_GB.po --msgid "null key sequence" --msgstr "null key sequence" -+msgid "%s: null key sequence" -+msgstr "%s: %s: null key sequence" -diff --git i/po/eo.po w/po/eo.po --msgid "null key sequence" --msgstr "malplena klavoserio" -+msgid "%s: null key sequence" -+msgstr "%s: malplena klavoserio" -diff --git i/po/es.po w/po/es.po --msgid "null key sequence" --msgstr "sequencia de teclas vacía" -+msgid "%s: null key sequence" -+msgstr "%s: sequencia de teclas vacía" -diff --git i/po/et.po w/po/et.po --msgid "null key sequence" --msgstr "tühi klahvijärjend" -+msgid "%s: null key sequence" -+msgstr "%s: tühi klahvijärjend" -diff --git i/po/eu.po w/po/eu.po --msgid "null key sequence" --msgstr "baloigabeko sekuentzi gakoa" -+msgid "%s: null key sequence" -+msgstr "%s: baloigabeko sekuentzi gakoa" -diff --git i/po/fr.po w/po/fr.po --msgid "null key sequence" --msgstr "séquence de touches nulle" -+msgid "%s: null key sequence" -+msgstr "%s: séquence de touches nulle" -diff --git i/po/ga.po w/po/ga.po --msgid "null key sequence" --msgstr "seicheamh neamhbhailí" -+msgid "%s: null key sequence" -+msgstr "%s: seicheamh neamhbhailí" -diff --git i/po/gl.po w/po/gl.po --msgid "null key sequence" --msgstr "secuencia de teclas nula" -+msgid "%s: null key sequence" -+msgstr "%s: secuencia de teclas nula" -diff --git i/po/hu.po w/po/hu.po --msgid "null key sequence" --msgstr "üres billentyűzet-szekvencia" -+msgid "%s: null key sequence" -+msgstr "%s: üres billentyűzet-szekvencia" -diff --git i/po/id.po w/po/id.po --msgid "null key sequence" --msgstr "urutan tombol kosong" -+msgid "%s: null key sequence" -+msgstr "%s: urutan tombol kosong" -diff --git i/po/it.po w/po/it.po --msgid "null key sequence" --msgstr "sequenza di tasti nulla" -+msgid "%s: null key sequence" -+msgstr "%s: sequenza di tasti nulla" -diff --git i/po/ja.po w/po/ja.po --msgid "null key sequence" --msgstr "キーシーケンスがない" -+msgid "%s: null key sequence" -+msgstr "%s: キーシーケンスがない" -diff --git i/po/ko.po w/po/ko.po --msgid "null key sequence" --msgstr "공백 글쇠 시퀀스" -+msgid "%s: null key sequence" -+msgstr "%s: 공백 글쇠 시퀀스" -diff --git i/po/lt.po w/po/lt.po --msgid "null key sequence" --msgstr "nulinė klavišų seka" -+msgid "%s: null key sequence" -+msgstr "%s: nulinė klavišų seka" -diff --git i/po/nl.po w/po/nl.po --msgid "null key sequence" --msgstr "lege toetsenvolgorde" -+msgid "%s: null key sequence" -+msgstr "%s: lege toetsenvolgorde" -diff --git i/po/pl.po w/po/pl.po --msgid "null key sequence" --msgstr "pusta sekwencja klawiszy" -+msgid "%s: null key sequence" -+msgstr "%s: pusta sekwencja klawiszy" -diff --git i/po/pt_BR.po w/po/pt_BR.po --msgid "null key sequence" --msgstr "seqüência de teclas nula" -+msgid "%s: null key sequence" -+msgstr "%s: seqüência de teclas nula" -diff --git i/po/ru.po w/po/ru.po --msgid "null key sequence" --msgstr "последовательность клавиш пуста" -+msgid "%s: null key sequence" -+msgstr "%s: последовательность клавиш пуста" -diff --git i/po/sk.po w/po/sk.po --msgid "null key sequence" --msgstr "prázdna postupnosť kláves" -+msgid "%s: null key sequence" -+msgstr "%s: prázdna postupnosť kláves" -diff --git i/po/sv.po w/po/sv.po --msgid "null key sequence" --msgstr "tom tangentsekvens" -+msgid "%s: null key sequence" -+msgstr "%s: tom tangentsekvens" -diff --git i/po/tr.po w/po/tr.po --msgid "null key sequence" --msgstr "boş tuş dizisi" -+msgid "%s: null key sequence" -+msgstr "%s: boş tuş dizisi" -diff --git i/po/uk.po w/po/uk.po --msgid "null key sequence" --msgstr "порожня послідовність клавіш" -+msgid "%s: null key sequence" -+msgstr "%s: порожня послідовність клавіш" -diff --git i/po/zh_CN.po w/po/zh_CN.po --msgid "null key sequence" --msgstr "空的键值序列" -+msgid "%s: null key sequence" -+msgstr "%s: 空的键值序列" -diff --git i/po/zh_TW.po w/po/zh_TW.po --msgid "null key sequence" --msgstr "空的鍵值序列" -+msgid "%s: null key sequence" -+msgstr "%s: 空的鍵值序列" diff --git a/handler.c b/handler.c index 2a8f00a2c..aab324528 100644 --- a/handler.c +++ b/handler.c @@ -503,7 +503,7 @@ static void enriched_wrap(struct EnrichedState *stte) } const int extra = stte->wrap_margin - stte->line_len - stte->indent_len - - (stte->tag_level[RICH_INDENT_RIGHT] * INDENT_SIZE); + (stte->tag_level[RICH_INDENT_RIGHT] * INDENT_SIZE); if (extra > 0) { if (stte->tag_level[RICH_CENTER]) diff --git a/help.c b/help.c index 9758305be..3ab125878 100644 --- a/help.c +++ b/help.c @@ -122,7 +122,7 @@ static int print_macro(FILE *f, int maxwidth, const char **macro) } /* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */ const int w = wcwidth(wc); - if (IsWPrint(wc) && w >= 0) + if (IsWPrint(wc) && w >= 0) { if (w > n) break; diff --git a/imap/imap.c b/imap/imap.c index e2d48a1d9..311b3628b 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -126,7 +126,7 @@ static char *get_flags(struct ListHead *hflags, char *s) { s++; SKIPWS(s); - const char* flag_word = s; + const char *flag_word = s; while (*s && (*s != ')') && !ISSPACE(*s)) s++; const char ctmp = *s; @@ -183,7 +183,7 @@ static void set_flag(struct ImapData *idata, int aclbit, int flag, static int make_msg_set(struct ImapData *idata, struct Buffer *buf, int flag, bool changed, bool invert, int *pos) { - int count = 0; /* number of messages in message set */ + int count = 0; /* number of messages in message set */ unsigned int setstart = 0; /* start of current message range */ int n; bool started = false; diff --git a/init.c b/init.c index 61a8039f7..af18654e8 100644 --- a/init.c +++ b/init.c @@ -1898,25 +1898,25 @@ static void restore_default(struct Option *p) *((struct MbTable **) p->var) = parse_mbtable((char *) p->initial); break; case DT_PATH: + { + char *init = (char *) p->initial; + if (mutt_str_strcmp(p->name, "debug_file") == 0) { - char *init = (char *) p->initial; - if (mutt_str_strcmp(p->name, "debug_file") == 0) - { - mutt_log_set_file(init, true); - } - else + mutt_log_set_file(init, true); + } + else + { + FREE((char **) p->var); + if (init) { - FREE((char **) p->var); - if (init) - { - char path[_POSIX_PATH_MAX]; - mutt_str_strfcpy(path, init, sizeof(path)); - mutt_expand_path(path, sizeof(path)); - *((char **) p->var) = mutt_str_strdup(path); - } + char path[_POSIX_PATH_MAX]; + mutt_str_strfcpy(path, init, sizeof(path)); + mutt_expand_path(path, sizeof(path)); + *((char **) p->var) = mutt_str_strdup(path); } - break; } + break; + } case DT_ADDRESS: mutt_addr_free((struct Address **) p->var); if (p->initial) diff --git a/keymap.c b/keymap.c index a0374dbfb..398fc9954 100644 --- a/keymap.c +++ b/keymap.c @@ -977,7 +977,8 @@ int mutt_parse_push(struct Buffer *buf, struct Buffer *s, unsigned long data, * * Expects to see: ,,... */ -static char *parse_keymap(int *menu, struct Buffer *s, int maxmenus, int *nummenus, struct Buffer *err, bool bind) +static char *parse_keymap(int *menu, struct Buffer *s, int maxmenus, + int *nummenus, struct Buffer *err, bool bind) { struct Buffer buf; int i = 0; diff --git a/mutt_logging.c b/mutt_logging.c index d81c61a56..f1fa568a3 100644 --- a/mutt_logging.c +++ b/mutt_logging.c @@ -45,8 +45,8 @@ char *DebugFile = NULL; /**< Log file name */ const int NumOfLogs = 5; /**< How many log files to rotate */ bool LogAllowDebugSet = false; -#define S_TO_NS 1000000000UL -#define S_TO_US 1000000UL +#define S_TO_NS 1000000000UL +#define S_TO_US 1000000UL #define US_TO_NS 1000UL /** @@ -61,8 +61,7 @@ static long micro_elapsed(const struct timeval *begin, const struct timeval *end if ((begin->tv_sec == 0) && (end->tv_sec != 0)) return LONG_MAX; - return ((end->tv_sec - begin->tv_sec) * S_TO_US) + - (end->tv_usec - begin->tv_usec); + return ((end->tv_sec - begin->tv_sec) * S_TO_US) + (end->tv_usec - begin->tv_usec); } /** @@ -267,7 +266,7 @@ void mutt_log_stop(void) } /** - * mutt_log_set_level - Change the logging level + * mutt_log_set_level - Change the logging level * @param level Logging level * @param verbose If true, then log the event * @retval 0 Success diff --git a/mutt_notmuch.c b/mutt_notmuch.c index 5ac108c0f..02829f8b1 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -489,9 +489,8 @@ static notmuch_database_t *do_database_open(const char *filename, bool writable, mutt_debug(1, "nm: db open '%s' %s (timeout %d)\n", filename, writable ? "[WRITE]" : "[READ]", NmOpenTimeout); - const notmuch_database_mode_t mode = writable - ? NOTMUCH_DATABASE_MODE_READ_WRITE - : NOTMUCH_DATABASE_MODE_READ_ONLY; + const notmuch_database_mode_t mode = + writable ? NOTMUCH_DATABASE_MODE_READ_WRITE : NOTMUCH_DATABASE_MODE_READ_ONLY; do { diff --git a/po/pt_BR.po b/po/pt_BR.po index 8b6002dc1..a92dd8ccc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6184,7 +6184,7 @@ msgstr "" " Este programa é distribuido com a expectativa de ser útil,\n" " mas SEM QUALQUER GARANTIA; até mesmo sem a garantia implícita de\n" " COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a\n" -" Licença Pública Geral (GPL) GNU para maiores detalhes.\n" +" Licença Pública Geral (GPL) GNU para maiores detalhes.\n" #: version.c:78 msgid "" diff --git a/recvattach.c b/recvattach.c index 81cc38be0..38b48f1dd 100644 --- a/recvattach.c +++ b/recvattach.c @@ -805,7 +805,8 @@ static void print_attachment_list(struct AttachCtx *actx, FILE *fp, bool tag, { if (!state->fpout) { - mutt_error("BUG in print_attachment_list(). Please report this. "); + mutt_error( + "BUG in print_attachment_list(). Please report this. "); return; } diff --git a/test/Makefile.autosetup b/test/Makefile.autosetup index 9fa92e4c7..541e88b32 100644 --- a/test/Makefile.autosetup +++ b/test/Makefile.autosetup @@ -1,7 +1,7 @@ TEST_OBJS = test/main.o \ test/base64.o \ - test/rfc2047.o \ test/md5.o \ + test/rfc2047.o \ test/string.o TEST_BINARY = test/neomutt-test$(EXEEXT) diff --git a/test/rfc2047.c b/test/rfc2047.c index 466d24f06..f08f201a7 100644 --- a/test/rfc2047.c +++ b/test/rfc2047.c @@ -53,7 +53,7 @@ static const struct void test_rfc2047(void) { - if (!TEST_CHECK((setlocale(LC_ALL, "en_US.UTF-8") != NULL) || + if (!TEST_CHECK((setlocale(LC_ALL, "en_US.UTF-8") != NULL) || (setlocale(LC_ALL, "C.UTF-8") != NULL))) { TEST_MSG("Cannot set locale to (en_US|C).UTF-8"); -- 2.40.0