pidgin/pidgin

Remove purple_input_pipe as nothing uses it anymore

4 weeks ago, Gary Kramlich
1f52237ebd7a
Parents b9ea4504f1ff
Children b632ff7a7936
Remove purple_input_pipe as nothing uses it anymore

Testing Done:
Called in the turtles.

Reviewed at https://reviews.imfreedom.org/r/3085/
4 files changed, 0 insertions(+), 142 deletions(-)
  • +0 -10
    libpurple/eventloop.c
  • +0 -22
    libpurple/eventloop.h
  • +0 -107
    libpurple/win32/win32dep.c
  • +0 -3
    libpurple/win32/win32dep.h
    • --- a/libpurple/eventloop.c Thu Apr 11 03:54:25 2024 -0500
    +++ b/libpurple/eventloop.c Thu Apr 11 04:02:16 2024 -0500
    @@ -90,13 +90,3 @@
    g_io_channel_unref(channel);
    return closure->result;
    }
    -
    -int
    -purple_input_pipe(int pipefd[2])
    -{
    -#ifdef _WIN32
    - return wpurple_input_pipe(pipefd);
    -#else
    - return pipe(pipefd);
    -#endif
    -}
    --- a/libpurple/eventloop.h Thu Apr 11 03:54:25 2024 -0500
    +++ b/libpurple/eventloop.h Thu Apr 11 04:02:16 2024 -0500
    @@ -87,28 +87,6 @@
    PURPLE_AVAILABLE_IN_ALL
    guint purple_input_add(int fd, PurpleInputCondition cond, PurpleInputFunction func, gpointer user_data);
    -/**
    - * purple_input_pipe:
    - * @pipefd: Array used to return file descriptors for both ends of pipe.
    - *
    - * Creates a pipe - an unidirectional data channel that can be used for
    - * interprocess communication.
    - *
    - * File descriptors for both ends of pipe will be written into provided array.
    - * The first one (pipefd[0]) can be used for reading, the second one (pipefd[1])
    - * for writing.
    - *
    - * On Windows it's simulated by creating a pair of connected sockets, on other
    - * systems pipe() is used.
    - *
    - * Returns: 0 on success, -1 on error.
    - *
    - * Since: 3.0
    - */
    -PURPLE_AVAILABLE_IN_3_0
    -int
    -purple_input_pipe(int pipefd[2]);
    -
    G_END_DECLS
    #endif /* PURPLE_EVENTLOOP_H */
    --- a/libpurple/win32/win32dep.c Thu Apr 11 03:54:25 2024 -0500
    +++ b/libpurple/win32/win32dep.c Thu Apr 11 04:02:16 2024 -0500
    @@ -198,113 +198,6 @@
    }
    /* Miscellaneous */
    -
    -int wpurple_input_pipe(int pipefd[2])
    -{
    - SOCKET sock_server, sock_client, sock_server_established;
    - struct sockaddr_in saddr_in;
    - struct sockaddr * const saddr_p = (struct sockaddr *)&saddr_in;
    - int saddr_len = sizeof(struct sockaddr_in);
    - u_long arg;
    - fd_set select_set;
    - char succ = 1;
    -
    - sock_server = sock_client = sock_server_established = INVALID_SOCKET;
    -
    - purple_debug_misc("wpurple", "wpurple_input_pipe(%p[%d,%d])\n", pipefd,
    - pipefd[0], pipefd[1]);
    -
    - /* create client and passive server sockets */
    - sock_server = socket(AF_INET, SOCK_STREAM, 0);
    - sock_client = socket(AF_INET, SOCK_STREAM, 0);
    - succ = (sock_server != INVALID_SOCKET || sock_client != INVALID_SOCKET);
    -
    - /* set created sockets into nonblocking mode */
    - arg = 1;
    - succ = (succ &&
    - ioctlsocket(sock_server, FIONBIO, &arg) != SOCKET_ERROR);
    - arg = 1;
    - succ = (succ &&
    - ioctlsocket(sock_client, FIONBIO, &arg) != SOCKET_ERROR);
    -
    - /* listen on server socket */
    - memset(&saddr_in, 0, saddr_len);
    - saddr_in.sin_family = AF_INET;
    - saddr_in.sin_port = 0;
    - saddr_in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
    - succ = (succ &&
    - bind(sock_server, saddr_p, saddr_len) != SOCKET_ERROR &&
    - listen(sock_server, 1) != SOCKET_ERROR &&
    - getsockname(sock_server, saddr_p, &saddr_len) != SOCKET_ERROR);
    -
    - /* request a connection from client to server socket */
    - succ = (succ &&
    - connect(sock_client, saddr_p, saddr_len) == SOCKET_ERROR &&
    - WSAGetLastError() == WSAEWOULDBLOCK);
    -
    - /* ensure, that server socket is readable */
    - if (succ)
    - {
    - FD_ZERO(&select_set);
    - FD_SET(sock_server, &select_set);
    - }
    - succ = (succ &&
    - select(0, &select_set, NULL, NULL, NULL) != SOCKET_ERROR &&
    - FD_ISSET(sock_server, &select_set));
    -
    - /* accept (establish) connection from client socket */
    - if (succ)
    - {
    - sock_server_established =
    - accept(sock_server, saddr_p, &saddr_len);
    - succ = (sock_server_established != INVALID_SOCKET);
    - }
    -
    - /* ensure, that client socket is writable */
    - if (succ)
    - {
    - FD_ZERO(&select_set);
    - FD_SET(sock_client, &select_set);
    - }
    - succ = (succ &&
    - select(0, NULL, &select_set, NULL, NULL) != SOCKET_ERROR &&
    - FD_ISSET(sock_client, &select_set));
    -
    - /* set sockets into blocking mode */
    - arg = 0;
    - succ = (succ &&
    - ioctlsocket(sock_client, FIONBIO, &arg) != SOCKET_ERROR);
    - arg = 0;
    - succ = (succ &&
    - ioctlsocket(sock_server_established, FIONBIO, &arg)
    - != SOCKET_ERROR);
    -
    - /* we don't need (passive) server socket anymore */
    - if (sock_server != INVALID_SOCKET)
    - closesocket(sock_server);
    -
    - if (succ)
    - {
    - purple_debug_misc("wpurple",
    - "wpurple_input_pipe created pipe [%" G_GUINTPTR_FORMAT
    - ",%" G_GUINTPTR_FORMAT "]\n",
    - sock_client, sock_server_established);
    - pipefd[0] = sock_client; /* for reading */
    - pipefd[1] = sock_server_established; /* for writing */
    - return 0;
    - }
    - else
    - {
    - purple_debug_error("wpurple", "wpurple_input_pipe failed\n");
    - if (sock_client != INVALID_SOCKET)
    - closesocket(sock_client);
    - if (sock_server_established != INVALID_SOCKET)
    - closesocket(sock_server_established);
    - errno = EMFILE;
    - return -1;
    - }
    -}
    -
    void wpurple_init(void) {
    WORD wVersionRequested;
    WSADATA wsaData;
    --- a/libpurple/win32/win32dep.h Thu Apr 11 03:54:25 2024 -0500
    +++ b/libpurple/win32/win32dep.h Thu Apr 11 04:02:16 2024 -0500
    @@ -60,9 +60,6 @@
    * The following API is private.
    */
    -/* Simulate unix pipes by creating a pair of connected sockets */
    -int wpurple_input_pipe(int pipefd[2]);
    -
    /* init / cleanup */
    void wpurple_init(void);
    void wpurple_cleanup(void);