Make option variables a little clearer by using separate FOO_ndx

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index dd7428e..823452f 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -95,7 +94,7 @@ static int establish_proxy_connection(int fd, char *host, int port,
                        buffer);
                return -1;
        }
-       for (cp = &buffer[5]; isdigit(*(uchar*)cp) || *cp == '.'; cp++) {}
+       for (cp = &buffer[5]; isDigit(cp) || *cp == '.'; cp++) {}
        while (*cp == ' ')
                cp++;
        if (*cp != '2') {
@@ -410,7 +409,7 @@ static int *open_socket_in(int type, int port, const char *bind_addr,
         * unsuccessful, or if the daemon is being run with -vv. */
        for (s = 0; s < ecnt; s++) {
                if (!i || verbose > 1)
-                       rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]));
+                       rwrite(FLOG, errmsgs[s], strlen(errmsgs[s]), 0);
                free(errmsgs[s]);
        }
        free(errmsgs);