Make the new manpage section better.

[rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 11ab4a83a4f2babf9bb4a11b998772c20a2f73b5..c2075adf8bb81cd05bc8342fdd37666704b7563e 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -26,6 +26,7 @@
 
 #include "rsync.h"
 #include "itypes.h"
+#include "ifuncs.h"
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif
@@ -49,8 +50,7 @@ static int sock_exec(const char *prog);
 /* Establish a proxy connection on an open socket to a web proxy by using the
  * CONNECT method.  If proxy_user and proxy_pass are not NULL, they are used to
  * authenticate to the proxy using the "Basic" proxy-authorization protocol. */
-static int establish_proxy_connection(int fd, char *host, int port,
-                                     char *proxy_user, char *proxy_pass)
+static int establish_proxy_connection(int fd, char *host, int port, char *proxy_user, char *proxy_pass)
 {
        char *cp, buffer[1024];
        char *authhdr, authbuf[1024];
@@ -182,8 +182,7 @@ static void contimeout_handler(UNUSED(int val))
  * bind_addr: local address to use.  Normally NULL to bind the wildcard address.
  *
  * af_hint: address family, e.g. AF_INET or AF_INET6. */
-int open_socket_out(char *host, int port, const char *bind_addr,
-                   int af_hint)
+int open_socket_out(char *host, int port, const char *bind_addr, int af_hint)
 {
        int type = SOCK_STREAM;
        int error, s, j, addr_cnt, *errnos;
@@ -250,8 +249,6 @@ int open_socket_out(char *host, int port, const char *bind_addr,
 
        for (res = res0, addr_cnt = 0; res; res = res->ai_next, addr_cnt++) {}
        errnos = new_array0(int, addr_cnt);
-       if (!errnos)
-               out_of_memory("open_socket_out");
 
        s = -1;
        /* Try to connect to all addresses for this machine until we get
@@ -294,9 +291,7 @@ int open_socket_out(char *host, int port, const char *bind_addr,
                        continue;
                }
 
-               if (proxied
-                && establish_proxy_connection(s, host, port,
-                                              proxy_user, proxy_pass) != 0) {
+               if (proxied && establish_proxy_connection(s, host, port, proxy_user, proxy_pass) != 0) {
                        close(s);
                        s = -1;
                        continue;
@@ -340,8 +335,7 @@ int open_socket_out(char *host, int port, const char *bind_addr,
  * This is based on the Samba LIBSMB_PROG feature.
  *
  * bind_addr: local address to use.  Normally NULL to get the stack default. */
-int open_socket_out_wrapped(char *host, int port, const char *bind_addr,
-                           int af_hint)
+int open_socket_out_wrapped(char *host, int port, const char *bind_addr, int af_hint)
 {
        char *prog = getenv("RSYNC_CONNECT_PROG");
 
@@ -359,8 +353,7 @@ int open_socket_out_wrapped(char *host, int port, const char *bind_addr,
                                len += hlen;
                }
                f = prog;
-               if (!(prog = new_array(char, len)))
-                       out_of_memory("open_socket_out_wrapped");
+               prog = new_array(char, len);
                for (t = prog; *f; f++) {
                        if (*f == '%') {
                                switch (*++f) {
@@ -428,8 +421,6 @@ static int *open_socket_in(int type, int port, const char *bind_addr,
 
        socks = new_array(int, maxs + 1);
        errmsgs = new_array(char *, maxs);
-       if (!socks || !errmsgs)
-               out_of_memory("open_socket_in");
 
        /* We may not be able to create the socket, if for example the
         * machine knows about IPv6 in the C library, but not in the
@@ -458,9 +449,8 @@ static int *open_socket_in(int type, int port, const char *bind_addr,
 
 #ifdef IPV6_V6ONLY
                if (resp->ai_family == AF_INET6) {
-                       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-                                      (char *)&one, sizeof one) < 0
-                           && default_af_hint != AF_INET6) {
+                       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&one, sizeof one) < 0
+                        && default_af_hint != AF_INET6) {
                                close(s);
                                continue;
                        }
@@ -561,8 +551,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
                        rsyserr(FERROR, errno, "listen() on socket failed");
 #ifdef INET6
                        if (errno == EADDRINUSE && i > 0) {
-                               rprintf(FINFO,
-                                   "Try using --ipv4 or --ipv6 to avoid this listen() error.\n");
+                               rprintf(FINFO, "Try using --ipv4 or --ipv6 to avoid this listen() error.\n");
                        }
 #endif
                        exit_cleanup(RERR_SOCKETIO);
@@ -597,8 +586,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
 
                for (i = 0, fd = -1; sp[i] >= 0; i++) {
                        if (FD_ISSET(sp[i], &fds)) {
-                               fd = accept(sp[i], (struct sockaddr *)&addr,
-                                           &addrlen);
+                               fd = accept(sp[i], (struct sockaddr *)&addr, &addrlen);
                                break;
                        }
                }
@@ -692,9 +680,6 @@ void set_socket_options(int fd, char *options)
 
        options = strdup(options);
 
-       if (!options)
-               out_of_memory("set_socket_options");
-
        for (tok = strtok(options, " \t,"); tok; tok = strtok(NULL," \t,")) {
                int ret=0,i;
                int value = 1;
@@ -799,8 +784,7 @@ static int socketpair_tcp(int fd[2])
        set_blocking(fd[1]);
 
        if (connect_done == 0) {
-               if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0
-                   && errno != EISCONN)
+               if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0 && errno != EISCONN)
                        goto failed;
        }