Skip to content

Commit

Permalink
tidy comments
Browse files Browse the repository at this point in the history
  • Loading branch information
flatcap committed Aug 17, 2018
1 parent 0a6b3c0 commit 090e300
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 65 deletions.
1 change: 0 additions & 1 deletion conn/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,6 @@ static int ssl_socket_open(struct Connection *conn)
* @param conn Connection to a server
* @retval 0 Success
* @retval -1 Error
*
*/
int mutt_ssl_starttls(struct Connection *conn)
{
Expand Down
103 changes: 51 additions & 52 deletions email/body.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,68 +32,67 @@
*/
struct Body
{
char *xtype; /**< content-type if x-unknown */
char *subtype; /**< content-type subtype */
char *language; /**< content-language (RFC8255) */
struct ParameterList parameter; /**< parameters of the content-type */
char *description; /**< content-description */
char *form_name; /**< Content-Disposition form-data name param */
long hdr_offset; /**< offset in stream where the headers begin.
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment */
LOFF_T offset; /**< offset where the actual data begins */
LOFF_T length; /**< length (in bytes) of attachment */
char *filename; /**< when sending a message, this is the file
* to which this structure refers */
char *d_filename; /**< filename to be used for the
* content-disposition header.
* If NULL, filename is used
* instead. */
char *charset; /**< charset of attached file */
struct Content *content; /**< structure used to store detailed info about
* the content of the attachment. this is used
* to determine what content-transfer-encoding
* is required when sending mail. */
struct Body *next; /**< next attachment in the list */
struct Body *parts; /**< parts of a multipart or message/rfc822 */
struct Header *hdr; /**< header information for message/rfc822 */
char *xtype; /**< content-type if x-unknown */
char *subtype; /**< content-type subtype */
char *language; /**< content-language (RFC8255) */
struct ParameterList parameter; /**< parameters of the content-type */
char *description; /**< content-description */
char *form_name; /**< Content-Disposition form-data name param */
long hdr_offset; /**< offset in stream where the headers begin.
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment */
LOFF_T offset; /**< offset where the actual data begins */
LOFF_T length; /**< length (in bytes) of attachment */
char *filename; /**< when sending a message, this is the file
* to which this structure refers */
char *d_filename; /**< filename to be used for the
content-disposition header.
* If NULL, filename is used instead. */
char *charset; /**< charset of attached file */
struct Content *content; /**< structure used to store detailed info about
* the content of the attachment. this is used
* to determine what content-transfer-encoding
* is required when sending mail. */
struct Body *next; /**< next attachment in the list */
struct Body *parts; /**< parts of a multipart or message/rfc822 */
struct Header *hdr; /**< header information for message/rfc822 */

struct AttachPtr *aptr; /**< Menu information, used in recvattach.c */
struct AttachPtr *aptr; /**< Menu information, used in recvattach.c */

signed short attach_count;

time_t stamp; /**< time stamp of last encoding update. */
time_t stamp; /**< time stamp of last encoding update. */

unsigned int type : 4; /**< content-type primary type */
unsigned int encoding : 3; /**< content-transfer-encoding */
unsigned int disposition : 2; /**< content-disposition */
bool use_disp : 1; /**< Content-Disposition uses filename= ? */
bool unlink : 1; /**< flag to indicate the file named by
* "filename" should be unlink()ed before
* free()ing this structure */
unsigned int type : 4; /**< content-type primary type */
unsigned int encoding : 3; /**< content-transfer-encoding */
unsigned int disposition : 2; /**< content-disposition */
bool use_disp : 1; /**< Content-Disposition uses filename= ? */
bool unlink : 1; /**< flag to indicate the file named by
* "filename" should be unlink()ed before
* free()ing this structure */
bool tagged : 1;
bool deleted : 1; /**< attachment marked for deletion */
bool deleted : 1; /**< attachment marked for deletion */

bool noconv : 1; /**< don't do character set conversion */
bool noconv : 1; /**< don't do character set conversion */
bool force_charset : 1;
/**< send mode: don't adjust the character
* set when in send-mode. */
bool is_signed_data : 1; /**< A lot of MUAs don't indicate S/MIME
* signed-data correctly, e.g. they use foo.p7m
* even for the name of signed data. This flag
* is used to keep track of the actual message
* type. It gets set during the verification
* (which is done if the encryption try failed)
* and check by the function to figure the type
* of the message. */
/**< send mode: don't adjust the character
* set when in send-mode. */
bool is_signed_data : 1; /**< A lot of MUAs don't indicate S/MIME
* signed-data correctly, e.g. they use foo.p7m
* even for the name of signed data. This flag
* is used to keep track of the actual message
* type. It gets set during the verification
* (which is done if the encryption try failed)
* and check by the function to figure the type
* of the message. */

bool goodsig : 1; /**< good cryptographic signature */
bool warnsig : 1; /**< maybe good signature */
bool badsig : 1; /**< bad cryptographic signature (needed to
* check encrypted s/mime-signatures) */
bool goodsig : 1; /**< good cryptographic signature */
bool warnsig : 1; /**< maybe good signature */
bool badsig : 1; /**< bad cryptographic signature (needed to
* check encrypted s/mime-signatures) */

bool collapsed : 1; /**< used by recvattach */
bool collapsed : 1; /**< used by recvattach */
bool attach_qualifies : 1;
};

Expand Down
3 changes: 1 addition & 2 deletions imap/imap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2672,8 +2672,7 @@ static int imap_tags_commit(struct Context *ctx, struct Header *hdr, char *buf)
mutt_buffer_addstr(cmd, ")");

/* Should we return here, or we are fine and we could
* continue to add new flags *
*/
* continue to add new flags */
if (imap_exec(idata, cmd->data, 0) != 0)
{
mutt_buffer_free(&cmd);
Expand Down
3 changes: 0 additions & 3 deletions init.h
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,6 @@ struct ConfigDef MuttVars[] = {
** .ts
** set certificate_file=~/.neomutt/certificates
** .te
**
*/
#endif
{ "change_folder_next", DT_BOOL, R_NONE, &ChangeFolderNext, false },
Expand Down Expand Up @@ -2572,7 +2571,6 @@ struct ConfigDef MuttVars[] = {
** Also note that using the old-style PGP message format is \fBstrongly\fP
** \fBdeprecated\fP.
** (PGP only)
**
*/
{ "pgp_retainable_sigs", DT_BOOL, R_NONE, &PgpRetainableSigs, false },
/*
Expand Down Expand Up @@ -3225,7 +3223,6 @@ struct ConfigDef MuttVars[] = {
** When this variable is \fIunset\fP, scoring is turned off. This can
** be useful to selectively disable scoring for certain folders when the
** $$score_threshold_delete variable and related are used.
**
*/
{ "score_threshold_delete", DT_NUMBER, R_NONE, &ScoreThresholdDelete, -1 },
/*
Expand Down
2 changes: 0 additions & 2 deletions mutt/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,6 @@ int mutt_file_chmod_add(const char *path, mode_t mode)
* stat(path, &st);
* // ... do something else with st ...
* mutt_file_chmod_add_stat(path, S_IWUSR | S_IWGRP | S_IWOTH, st);
*
*/
int mutt_file_chmod_add_stat(const char *path, mode_t mode, struct stat *st)
{
Expand Down Expand Up @@ -962,7 +961,6 @@ int mutt_file_chmod_rm(const char *path, mode_t mode)
* stat(path, &st);
* // ... do something else with st ...
* mutt_file_chmod_rm_stat(path, S_IWUSR | S_IWGRP | S_IWOTH, st);
*
*/
int mutt_file_chmod_rm_stat(const char *path, mode_t mode, struct stat *st)
{
Expand Down
1 change: 0 additions & 1 deletion mutt_attach.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ void mutt_check_lookup_list(struct Body *b, char *type, size_t len)
* Viewer processes are opened and waited on synchronously so viewing an
* attachment this way will block the main neomutt process until the viewer process
* exits.
*
*/
int mutt_view_attachment(FILE *fp, struct Body *a, int flag, struct Header *hdr,
struct AttachCtx *actx)
Expand Down
1 change: 0 additions & 1 deletion rfc1524.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,6 @@ int rfc1524_mailcap_lookup(struct Body *a, char *type,
* If both a nametemplate and oldfile are specified, the template is checked
* for a "%s". If none is found, the nametemplate is used as the template for
* newfile. The first path component of the nametemplate and oldfile are ignored.
*
*/
int rfc1524_expand_filename(char *nametemplate, char *oldfile, char *newfile, size_t nflen)
{
Expand Down
4 changes: 1 addition & 3 deletions send.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,7 @@ static int default_to(struct Address **to, struct Envelope *env, int flags, int
*
* We also take the from header if our correspondent has a reply-to
* header which is identical to the electronic mail address given
* in his From header, and the reply-to has no display-name.
*
*/
* in his From header, and the reply-to has no display-name. */
mutt_addr_append(to, env->from, false);
}
else if (!(mutt_addr_cmp(env->from, env->reply_to) && !env->reply_to->next) &&
Expand Down

0 comments on commit 090e300

Please sign in to comment.