pidgin/pidgin

Remove socket utility functions.

2020-12-19, Elliott Sales de Andrade
a1d86d4fec2e
Parents ae3652f5ca05
Children 2010d1935fb0
Remove socket utility functions.

Testing Done:
Compile only; they were unused.

Reviewed at https://reviews.imfreedom.org/r/294/
3 files changed, 2 insertions(+), 75 deletions(-)
  • +2 -0
    ChangeLog.API
  • +0 -51
    libpurple/util.c
  • +0 -24
    libpurple/util.h
    • --- a/ChangeLog.API Fri Dec 18 04:55:34 2020 -0600
    +++ b/ChangeLog.API Sat Dec 19 03:11:32 2020 -0600
    @@ -457,6 +457,8 @@
    * purple_restore_default_signal_handlers
    * purple_request_certificate
    * purple_request_field_list_add
    + * purple_socket_get_family
    + * purple_socket_speaks_ipv4
    * PurpleSoundUiOps
    * PurpleSoundStatus
    * PURPLE_SOUND_STATUS_AVAILABLE
    --- a/libpurple/util.c Fri Dec 18 04:55:34 2020 -0600
    +++ b/libpurple/util.c Sat Dec 19 03:11:32 2020 -0600
    @@ -828,57 +828,6 @@
    #endif
    }
    -typedef union purple_sockaddr {
    - struct sockaddr sa;
    - struct sockaddr_in sa_in;
    -#if defined(AF_INET6)
    - struct sockaddr_in6 sa_in6;
    -#endif
    - struct sockaddr_storage sa_stor;
    -} PurpleSockaddr;
    -
    -int
    -purple_socket_get_family(int fd)
    -{
    - PurpleSockaddr addr;
    - socklen_t len = sizeof(addr);
    -
    - g_return_val_if_fail(fd >= 0, -1);
    -
    - if (getsockname(fd, &(addr.sa), &len))
    - return -1;
    -
    - return addr.sa.sa_family;
    -}
    -
    -gboolean
    -purple_socket_speaks_ipv4(int fd)
    -{
    - int family;
    -
    - g_return_val_if_fail(fd >= 0, FALSE);
    -
    - family = purple_socket_get_family(fd);
    -
    - switch (family) {
    - case AF_INET:
    - return TRUE;
    -#if defined(IPV6_V6ONLY)
    - case AF_INET6:
    - {
    - int val = 0;
    - socklen_t len = sizeof(val);
    -
    - if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
    - return FALSE;
    - return !val;
    - }
    -#endif
    - default:
    - return FALSE;
    - }
    -}
    -
    /**************************************************************************
    * String Functions
    **************************************************************************/
    --- a/libpurple/util.h Fri Dec 18 04:55:34 2020 -0600
    +++ b/libpurple/util.h Sat Dec 19 03:11:32 2020 -0600
    @@ -519,30 +519,6 @@
    */
    gboolean purple_running_osx(void);
    -/**
    - * purple_socket_get_family:
    - * @fd: The socket file descriptor.
    - *
    - * Returns the address family of a socket.
    - *
    - * Returns: The address family of the socket (AF_INET, AF_INET6, etc) or -1
    - * on error.
    - */
    -int purple_socket_get_family(int fd);
    -
    -/**
    - * purple_socket_speaks_ipv4:
    - * @fd: The socket file descriptor
    - *
    - * Returns TRUE if a socket is capable of speaking IPv4.
    - *
    - * This is the case for IPv4 sockets and, on some systems, IPv6 sockets
    - * (due to the IPv4-mapped address functionality).
    - *
    - * Returns: TRUE if a socket can speak IPv4.
    - */
    -gboolean purple_socket_speaks_ipv4(int fd);
    -
    /**************************************************************************/
    /* String Functions */