From d492c3f569b6d5c60d4ab112cb27cc07b86966a2 Mon Sep 17 00:00:00 2001 From: Damien Riegel Date: Wed, 8 Nov 2017 15:44:41 -0500 Subject: [PATCH] conn: rename socket_new_conn to mutt_socket_new Make this function be in the same "namespace" as other Connection related functions by making its prefix be "mutt_socket". --- conn/socket.c | 4 ++-- conn/socket.h | 2 +- mutt_socket.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conn/socket.c b/conn/socket.c index ca99d7bf4..6cdbdfdf8 100644 --- a/conn/socket.c +++ b/conn/socket.c @@ -332,10 +332,10 @@ int mutt_socket_readln_d(char *buf, size_t buflen, struct Connection *conn, int } /** - * socket_new_conn - allocate and initialise a new connection + * mutt_socket_new - allocate and initialise a new connection * @retval ptr New Connection */ -struct Connection *socket_new_conn(void) +struct Connection *mutt_socket_new(void) { struct Connection *conn = mutt_mem_calloc(1, sizeof(struct Connection)); conn->fd = -1; diff --git a/conn/socket.h b/conn/socket.h index 955e57f07..655eb6957 100644 --- a/conn/socket.h +++ b/conn/socket.h @@ -29,7 +29,7 @@ struct Connection; -struct Connection *socket_new_conn(void); +struct Connection *mutt_socket_new(void); int mutt_socket_open(struct Connection *conn); int mutt_socket_close(struct Connection *conn); diff --git a/mutt_socket.c b/mutt_socket.c index daabc9eff..b00536837 100644 --- a/mutt_socket.c +++ b/mutt_socket.c @@ -83,7 +83,7 @@ struct Connection *mutt_conn_find(const struct Connection *start, const struct A conn = TAILQ_NEXT(conn, entries); } - conn = socket_new_conn(); + conn = mutt_socket_new(); memcpy(&conn->account, account, sizeof(struct Account)); TAILQ_INSERT_HEAD(&Connections, conn, entries); -- 2.40.0