tidy: sort out typedef usage

diff --git a/color.c b/color.c
index 181ac43463d42c5ed7d2a049284ddcf7f174116c..498f36639ada51df2da80ad6a9fb13607dfae486 100644 (file)
--- a/color.c
+++ b/color.c
@@ -750,8 +750,8 @@ static int parse_object(struct Buffer *buf, struct Buffer *s, int *o, int *ql,
   return 0;
 }
 
-typedef int (*parser_callback_t)(struct Buffer *, struct Buffer *, int *, int *,
-                                 int *, struct Buffer *);
+typedef int (*parser_callback_t)(struct Buffer *buf, struct Buffer *s, int *fg,
+                                 int *bg, int *attr, struct Buffer *err);
 
 #ifdef HAVE_COLOR
 

diff --git a/handler.c b/handler.c
index 73d9c92cccdca855272938967dbee321d06abf8e..1e1f7bf4611a023196c59649b4037b2159f6fbda 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -58,7 +58,7 @@
 #define BUFI_SIZE 1000
 #define BUFO_SIZE 2000
 
-typedef int (*handler_t)(struct Body *, struct State *);
+typedef int (*handler_t)(struct Body *b, struct State *s);
 
 // clang-format off
 const int Index_hex[128] = {

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 446fd8af76ae618b9f6e977f719be982fe353540..da61ec06f82977adfcead6bd55fd95af420c3c3a 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -87,11 +87,11 @@ typedef gnutls_x509_crt gnutls_x509_crt_t;
 /**
  * struct TlsSockData - TLS socket data
  */
-typedef struct TlsSockData
+struct TlsSockData
 {
   gnutls_session_t state;
   gnutls_certificate_credentials_t xcred;
-} tlssockdata;
+};
 
 static int tls_init(void)
 {
@@ -115,7 +115,7 @@ static int tls_init(void)
 
 static int tls_socket_read(struct Connection *conn, char *buf, size_t len)
 {
-  tlssockdata *data = conn->sockdata;
+  struct TlsSockData *data = conn->sockdata;
   int ret;
 
   if (!data)
@@ -141,7 +141,7 @@ static int tls_socket_read(struct Connection *conn, char *buf, size_t len)
 
 static int tls_socket_write(struct Connection *conn, const char *buf, size_t len)
 {
-  tlssockdata *data = conn->sockdata;
+  struct TlsSockData *data = conn->sockdata;
   int ret;
   size_t sent = 0;
 
@@ -173,7 +173,7 @@ static int tls_socket_write(struct Connection *conn, const char *buf, size_t len
 
 static int tls_socket_close(struct Connection *conn)
 {
-  tlssockdata *data = conn->sockdata;
+  struct TlsSockData *data = conn->sockdata;
   if (data)
   {
     /* shut down only the write half to avoid hanging waiting for the remote to respond.
@@ -817,7 +817,7 @@ static int tls_check_one_certificate(const gnutls_datum_t *certdata,
 
 static int tls_check_certificate(struct Connection *conn)
 {
-  tlssockdata *data = conn->sockdata;
+  struct TlsSockData *data = conn->sockdata;
   gnutls_session_t state = data->state;
   const gnutls_datum_t *cert_list = NULL;
   unsigned int cert_list_size = 0;
@@ -895,7 +895,7 @@ static int tls_check_certificate(struct Connection *conn)
 
 static void tls_get_client_cert(struct Connection *conn)
 {
-  tlssockdata *data = conn->sockdata;
+  struct TlsSockData *data = conn->sockdata;
   const gnutls_datum_t *crtdata = NULL;
   gnutls_x509_crt_t clientcrt;
   char *dn = NULL;
@@ -949,7 +949,7 @@ err_crt:
 }
 
 #ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
-static int tls_set_priority(tlssockdata *data)
+static int tls_set_priority(struct TlsSockData *data)
 {
   size_t nproto = 4;
   char *priority = NULL;
@@ -1012,7 +1012,7 @@ static int tls_set_priority(tlssockdata *data)
 static int protocol_priority[] = { GNUTLS_TLS1_2, GNUTLS_TLS1_1, GNUTLS_TLS1,
                                    GNUTLS_SSL3, 0 };
 
-static int tls_set_priority(tlssockdata *data)
+static int tls_set_priority(struct TlsSockData *data)
 {
   size_t nproto = 0; /* number of tls/ssl protocols */
 
@@ -1055,10 +1055,10 @@ static int tls_set_priority(tlssockdata *data)
  */
 static int tls_negotiate(struct Connection *conn)
 {
-  tlssockdata *data = NULL;
+  struct TlsSockData *data = NULL;
   int err;
 
-  data = safe_calloc(1, sizeof(tlssockdata));
+  data = safe_calloc(1, sizeof(struct TlsSockData));
   conn->sockdata = data;
   err = gnutls_certificate_allocate_credentials(&data->xcred);
   if (err < 0)

diff --git a/rfc2047.c b/rfc2047.c
index 1a2079fe13b308ccc8cef64126df7e6f79921b51..98283c617dd664e8e97a5c0181273c58d9ca3b53 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -53,7 +53,7 @@
 
 extern char RFC822Specials[];
 
-typedef size_t (*encoder_t)(char *, ICONV_CONST char *, size_t, const char *);
+typedef size_t (*encoder_t)(char *s, ICONV_CONST char *d, size_t dlen, const char *tocode);
 
 static size_t convert_string(ICONV_CONST char *f, size_t flen, const char *from,
                              const char *to, char **t, size_t *tlen)