Tweaked one or more warning messages.

diff --git a/clientserver.c b/clientserver.c
index 159a5a1..98909f5 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -264,7 +264,7 @@ static int rsync_module(int f_in, int f_out, int i)
                } else {
                        rprintf(FLOG, "max connections (%d) reached\n",
                                lp_max_connections(i));
-                       io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+                       io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n",
                                lp_max_connections(i));
                }
                return -1;

diff --git a/compat.c b/compat.c
index e90fa83..7e4cf92 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -55,7 +55,7 @@ void setup_protocol(int f_out,int f_in)
        }
        if (remote_protocol < MIN_PROTOCOL_VERSION
         || remote_protocol > MAX_PROTOCOL_VERSION) {
-               rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
+               rprintf(FERROR,"protocol version mismatch -- is your shell clean?\n");
                rprintf(FERROR,"(see the rsync man page for an explanation)\n");
                exit_cleanup(RERR_PROTOCOL);
        }

diff --git a/flist.c b/flist.c
index b88ab8b..9ee7dcd 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1690,7 +1690,7 @@ void delete_in_dir(struct file_list *flist, char *fname)
 
        if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
                rprintf(FINFO,
-                       "IO error encountered - skipping file deletion\n");
+                       "IO error encountered -- skipping file deletion\n");
                max_delete = -1; /* avoid duplicating the above warning */
                return;
        }

diff --git a/io.c b/io.c
index 9b95100..828f552 100644 (file)
--- a/io.c
+++ b/io.c
@@ -149,7 +149,7 @@ static void check_timeout(void)
 
        if (t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
-                       rprintf(FERROR, "io timeout after %d seconds - exiting\n",
+                       rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
                                (int)(t-last_io));
                }
                exit_cleanup(RERR_TIMEOUT);

diff --git a/log.c b/log.c
index 6d96919..43f490f 100644 (file)
--- a/log.c
+++ b/log.c
@@ -418,7 +418,7 @@ static void log_formatted(enum logcode code,
                l = strlen(n);
 
                if (l + ((int)(s - &buf[0])) >= sizeof(buf)) {
-                       rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
+                       rprintf(FERROR,"buffer overflow expanding %%%c -- exiting\n",
                                p[0]);
                        exit_cleanup(RERR_MESSAGEIO);
                }

diff --git a/receiver.c b/receiver.c
index e129b1d..7f807d9 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -62,7 +62,7 @@ void delete_files(struct file_list *flist)
 
        if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
                rprintf(FINFO,
-                       "IO error encountered - skipping file deletion\n");
+                       "IO error encountered -- skipping file deletion\n");
                return;
        }
 

diff --git a/socket.c b/socket.c
index 7dadb26..a64aac6 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -90,7 +90,7 @@ static int establish_proxy_connection(int fd, char *host, int port,
        if (*cp == '\r')
                *cp = '\0';
        if (strncmp(buffer, "HTTP/", 5) != 0) {
-               rprintf(FERROR, "bad response from proxy - %s\n",
+               rprintf(FERROR, "bad response from proxy -- %s\n",
                        buffer);
                return -1;
        }
@@ -98,7 +98,7 @@ static int establish_proxy_connection(int fd, char *host, int port,
        while (*cp == ' ')
                cp++;
        if (*cp != '2') {
-               rprintf(FERROR, "bad response from proxy - %s\n",
+               rprintf(FERROR, "bad response from proxy -- %s\n",
                        buffer);
                return -1;
        }
@@ -616,7 +616,7 @@ void set_socket_options(int fd, char *options)
 
                case OPT_ON:
                        if (got_value)
-                               rprintf(FERROR,"syntax error - %s does not take a value\n",tok);
+                               rprintf(FERROR,"syntax error -- %s does not take a value\n",tok);
 
                        {
                                int on = socket_options[i].value;