From 3dda8f5b9e85c97d34bae15257ecd371953408a6 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Mon, 17 Sep 2018 13:58:58 +0100
Subject: [PATCH] rename socket-private data structs

---
 conn/sasl.c   | 12 ++++++------
 conn/sasl.h   |  4 ++--
 conn/tunnel.c | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/conn/sasl.c b/conn/sasl.c
index 1d6521054..32209f1af 100644
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -331,7 +331,7 @@ static sasl_callback_t *mutt_sasl_get_callbacks(struct ConnAccount *account)
  */
 static int mutt_sasl_conn_open(struct Connection *conn)
 {
-  struct SaslData *sasldata = conn->sockdata;
+  struct SaslSockData *sasldata = conn->sockdata;
   conn->sockdata = sasldata->sockdata;
   int rc = (sasldata->msasl_open)(conn);
   conn->sockdata = sasldata;
@@ -350,7 +350,7 @@ static int mutt_sasl_conn_open(struct Connection *conn)
  */
 static int mutt_sasl_conn_close(struct Connection *conn)
 {
-  struct SaslData *sasldata = conn->sockdata;
+  struct SaslSockData *sasldata = conn->sockdata;
 
   /* restore connection's underlying methods */
   conn->sockdata = sasldata->sockdata;
@@ -383,7 +383,7 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t buflen
   int rc;
   unsigned int olen;
 
-  struct SaslData *sasldata = conn->sockdata;
+  struct SaslSockData *sasldata = conn->sockdata;
 
   /* if we still have data in our read buffer, copy it into buf */
   if (sasldata->blen > sasldata->bpos)
@@ -453,7 +453,7 @@ static int mutt_sasl_conn_write(struct Connection *conn, const char *buf, size_t
   const char *pbuf = NULL;
   unsigned int olen, plen;
 
-  struct SaslData *sasldata = conn->sockdata;
+  struct SaslSockData *sasldata = conn->sockdata;
   conn->sockdata = sasldata->sockdata;
 
   /* encode data, if necessary */
@@ -504,7 +504,7 @@ fail:
  */
 static int mutt_sasl_conn_poll(struct Connection *conn, time_t wait_secs)
 {
-  struct SaslData *sasldata = conn->sockdata;
+  struct SaslSockData *sasldata = conn->sockdata;
   int rc;
 
   conn->sockdata = sasldata->sockdata;
@@ -666,7 +666,7 @@ int mutt_sasl_interact(sasl_interact_t *interaction)
  */
 void mutt_sasl_setup_conn(struct Connection *conn, sasl_conn_t *saslconn)
 {
-  struct SaslData *sasldata = mutt_mem_malloc(sizeof(struct SaslData));
+  struct SaslSockData *sasldata = mutt_mem_malloc(sizeof(struct SaslSockData));
   /* work around sasl_getprop aliasing issues */
   const void *tmp = NULL;
 
diff --git a/conn/sasl.h b/conn/sasl.h
index 3f6aa7251..3dd738857 100644
--- a/conn/sasl.h
+++ b/conn/sasl.h
@@ -37,9 +37,9 @@ void mutt_sasl_setup_conn(struct Connection *conn, sasl_conn_t *saslconn);
 void mutt_sasl_done(void);
 
 /**
- * struct SaslData - SASL authentication API
+ * struct SaslSockData - SASL authentication API
  */
-struct SaslData
+struct SaslSockData
 {
   sasl_conn_t *saslconn;
   const sasl_ssf_t *ssf;
diff --git a/conn/tunnel.c b/conn/tunnel.c
index 3b7e88081..fb15e99cb 100644
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -43,9 +43,9 @@
 #include "socket.h"
 
 /**
- * struct TunnelData - A network tunnel (pair of sockets)
+ * struct TunnelSockData - A network tunnel (pair of sockets)
  */
-struct TunnelData
+struct TunnelSockData
 {
   pid_t pid;
   int readfd;
@@ -59,7 +59,7 @@ static int tunnel_socket_open(struct Connection *conn)
 {
   int pin[2], pout[2];
 
-  struct TunnelData *tunnel = mutt_mem_malloc(sizeof(struct TunnelData));
+  struct TunnelSockData *tunnel = mutt_mem_malloc(sizeof(struct TunnelSockData));
   conn->sockdata = tunnel;
 
   mutt_message(_("Connecting with \"%s\"..."), Tunnel);
@@ -136,7 +136,7 @@ static int tunnel_socket_open(struct Connection *conn)
  */
 static int tunnel_socket_read(struct Connection *conn, char *buf, size_t len)
 {
-  struct TunnelData *tunnel = conn->sockdata;
+  struct TunnelSockData *tunnel = conn->sockdata;
   int rc;
 
   rc = read(tunnel->readfd, buf, len);
@@ -153,7 +153,7 @@ static int tunnel_socket_read(struct Connection *conn, char *buf, size_t len)
  */
 static int tunnel_socket_write(struct Connection *conn, const char *buf, size_t len)
 {
-  struct TunnelData *tunnel = conn->sockdata;
+  struct TunnelSockData *tunnel = conn->sockdata;
   int rc;
 
   rc = write(tunnel->writefd, buf, len);
@@ -170,7 +170,7 @@ static int tunnel_socket_write(struct Connection *conn, const char *buf, size_t
  */
 static int tunnel_socket_poll(struct Connection *conn, time_t wait_secs)
 {
-  struct TunnelData *tunnel = conn->sockdata;
+  struct TunnelSockData *tunnel = conn->sockdata;
   int ofd;
   int rc;
 
@@ -187,7 +187,7 @@ static int tunnel_socket_poll(struct Connection *conn, time_t wait_secs)
  */
 static int tunnel_socket_close(struct Connection *conn)
 {
-  struct TunnelData *tunnel = conn->sockdata;
+  struct TunnelSockData *tunnel = conn->sockdata;
   int status;
 
   close(tunnel->readfd);
-- 
2.40.0