From: Richard Russon Date: Thu, 4 Oct 2018 14:20:09 +0000 (+0100) Subject: clang-format X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbac7afdac5d8302884e34273bdfb0bf74cf85a1;p=neomutt clang-format --- diff --git a/conn/sasl.c b/conn/sasl.c index e241d9bcb..ea188d302 100644 --- a/conn/sasl.c +++ b/conn/sasl.c @@ -377,9 +377,8 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t count) /* if we still have data in our read buffer, copy it into buf */ if (sasldata->blen > sasldata->bpos) { - olen = (sasldata->blen - sasldata->bpos > count) ? - count : - sasldata->blen - sasldata->bpos; + olen = (sasldata->blen - sasldata->bpos > count) ? count : + sasldata->blen - sasldata->bpos; memcpy(buf, sasldata->buf + sasldata->bpos, olen); sasldata->bpos += olen; @@ -410,9 +409,8 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t count) } } while (sasldata->blen == 0); - olen = (sasldata->blen - sasldata->bpos > count) ? - count : - sasldata->blen - sasldata->bpos; + olen = (sasldata->blen - sasldata->bpos > count) ? count : + sasldata->blen - sasldata->bpos; memcpy(buf, sasldata->buf, olen); sasldata->bpos += olen; diff --git a/hdrline.c b/hdrline.c index d4782e173..ba167dcd5 100644 --- a/hdrline.c +++ b/hdrline.c @@ -272,6 +272,7 @@ static const char *make_from_prefix(enum FieldType disp) * @param buf Buffer to store the result * @param buflen Size of the buffer * @param do_lists Should we check for mailing lists? + * @param flags Format flags, e.g. #MUTT_FORMAT_PLAIN * * Generate the %F or %L field in $index_format. * This is the author, or recipient of the email.