From 20e0e95b93f7f1eada65ac6b8e7729534537618c Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Mon, 21 May 2018 20:21:14 -0600 Subject: * Nothing to see here, this is just reformatting of the code to make it easier to find functions when I need to do so. --- alpine/colorconf.c | 3 ++- alpine/mailcmd.c | 3 ++- alpine/smime.c | 14 +++++++++----- pico/search.c | 6 ++++-- pith/ical.c | 15 ++++++++++----- pith/smime.c | 14 ++++++++------ pith/smkeys.c | 2 +- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/alpine/colorconf.c b/alpine/colorconf.c index 015b2fe0..f790c768 100644 --- a/alpine/colorconf.c +++ b/alpine/colorconf.c @@ -1214,7 +1214,8 @@ offer_none_color_for_var(struct pine *ps, struct variable *var) || var == &ps->vars[V_KW_COLORS])); } -char *colorindexrule(char *s) +char * +colorindexrule(char *s) { char *conftext; char ***alval, **t; diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index d75aed6b..b741261b 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -9381,7 +9381,8 @@ choose_list_of_charsets(void) /* Report quota summary resources in an IMAP server */ -void cmd_quota (struct pine *state) +void +cmd_quota (struct pine *state) { QUOTALIST *imapquota; NETMBX mb; diff --git a/alpine/smime.c b/alpine/smime.c index 0bf051ec..641ef264 100644 --- a/alpine/smime.c +++ b/alpine/smime.c @@ -1072,7 +1072,8 @@ smime_config_init_display(struct pine *ps, CONF_S **ctmp, CONF_S **first_line) (*ctmp)->next = NULL; } -void display_certificate_information(struct pine *ps, X509 *cert, char *email, WhichCerts ctype, int num) +void +display_certificate_information(struct pine *ps, X509 *cert, char *email, WhichCerts ctype, int num) { STORE_S *store; SCROLL_S scrollargs; @@ -1260,7 +1261,7 @@ manage_certificate_info_tool(int cmd, MSGNO_S *msgmap, SCROLL_S *sparms) case MC_TRUST: rv = 1; break; default: rv = 0; break; } - return rv; + return rv; } @@ -1464,7 +1465,8 @@ smime_setup_size(char **s, size_t buflen, size_t n) } #ifdef PASSFILE -void manage_password_file_certificates(struct pine *ps) +void +manage_password_file_certificates(struct pine *ps) { OPT_SCREEN_S screen; int readonly_warning = 0, rv = 10, fline, state = 0; @@ -1631,7 +1633,8 @@ smime_manage_password_file_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **f #endif /* PASSFILE */ -void smime_manage_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **first_line, WhichCerts ctype, int fline) +void +smime_manage_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **first_line, WhichCerts ctype, int fline) { char tmp[200]; char *ext; @@ -1743,7 +1746,8 @@ void smime_manage_certs_init(struct pine *ps, CONF_S **ctmp, CONF_S **first_line } } -void manage_certificates(struct pine *ps, WhichCerts ctype) +void +manage_certificates(struct pine *ps, WhichCerts ctype) { OPT_SCREEN_S screen; int readonly_warning = 0, rv = 10, fline; diff --git a/pico/search.c b/pico/search.c index fe43c7b6..f3b8e473 100644 --- a/pico/search.c +++ b/pico/search.c @@ -1112,7 +1112,8 @@ readpattern(char *utf8prompt, int text_mode, int flags) } /* given a line, reverse its content */ -void reverse_line(LINE *l) +void +reverse_line(LINE *l) { int i, j, a; UCS u; @@ -1165,7 +1166,8 @@ reverse_buffer(void) /* given a UCS4 string reverse its content */ -void reverse_ucs4(UCS *s) +void +reverse_ucs4(UCS *s) { int i, j; UCS u; diff --git a/pith/ical.c b/pith/ical.c index 59e8c42c..cff1f542 100644 --- a/pith/ical.c +++ b/pith/ical.c @@ -299,7 +299,8 @@ ical_remove_escapes(char **textp) return rv; } -void ical_debug(char *fcn, char *text) +void +ical_debug(char *fcn, char *text) { char piece[50]; strncpy(piece, text, 49); @@ -477,7 +478,8 @@ ical_free_timezone(void **tzpv) fs_give(tzpv); } -void ical_free_valarm(void **valarmpv) +void +ical_free_valarm(void **valarmpv) { VALARM_S **valarmp = (VALARM_S **) valarmpv; int i, j; @@ -506,7 +508,8 @@ ical_free_unknown_comp(ICAL_S **icalp) fs_give((void **)icalp); } -char *ical_unfold_line(char *line) +char * +ical_unfold_line(char *line) { int i, j; @@ -575,7 +578,8 @@ ical_get_parameter(char **line) return param; } -char *ical_get_value(char **line) +char * +ical_get_value(char **line) { char *s, *t; @@ -2027,7 +2031,8 @@ ical_first_of_month(int month, int year) /* given a day, month and year, return the weekday of that day * return value: on error -1, otherwise the day of the week. */ -int ical_day_of_week(struct tm date) +int +ical_day_of_week(struct tm date) { int d; diff --git a/pith/smime.c b/pith/smime.c index 79a980e4..3888db4d 100644 --- a/pith/smime.c +++ b/pith/smime.c @@ -1023,7 +1023,8 @@ forget_private_keys(void) * directory where the .pinerc is located, since according to documentation, * the .alpine-smime directories are subdirectories of the home directory */ -int smime_path(char *rpath, char *fpath, size_t len) +int +smime_path(char *rpath, char *fpath, size_t len) { *fpath = '\0'; if(rpath && *rpath){ @@ -1234,7 +1235,8 @@ smime_deinit(void) } /* we renew the store when it has changed */ -void renew_store(void) +void +renew_store(void) { if(ps_global->smime->inited){ if(s_cert_store != NULL) @@ -1277,7 +1279,8 @@ smime_init(void) /* validate a certificate. Return value : 0 for no error, -1 for error. * In the latter case, set the openssl smime error in *error. */ -int smime_validate_cert(X509 *cert, long *error) +int +smime_validate_cert(X509 *cert, long *error) { X509_STORE_CTX *csc; @@ -1431,8 +1434,6 @@ setup_privatekey_storage(void) setup_certs_backup_by_type(Private); } - - static void setup_storage_locations(void) { @@ -2731,7 +2732,8 @@ get_pkcs7_from_part(long msgno,const char *section) return p7; } -int same_cert(X509 *x, X509 *cert) +int +same_cert(X509 *x, X509 *cert) { char bufcert[256], bufx[256]; int rv = 0; diff --git a/pith/smkeys.c b/pith/smkeys.c index 25144470..5fd7f97c 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -807,7 +807,7 @@ get_ca_store(void) resort_certificates(&ps_global->smime->cacertlist, CACert); } - if(!(lookup=X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir()))){ + if(!(lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir()))){ X509_STORE_free(store); return NULL; } -- cgit v1.2.3-70-g09d2