Commit 4ccfd96c authored by Wayne Davison's avatar Wayne Davison

Tweaked one or more warning messages.

parent 408aa7b2
...@@ -264,7 +264,7 @@ static int rsync_module(int f_in, int f_out, int i) ...@@ -264,7 +264,7 @@ static int rsync_module(int f_in, int f_out, int i)
} else { } else {
rprintf(FLOG, "max connections (%d) reached\n", rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i)); 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)); lp_max_connections(i));
} }
return -1; return -1;
......
...@@ -55,7 +55,7 @@ void setup_protocol(int f_out,int f_in) ...@@ -55,7 +55,7 @@ void setup_protocol(int f_out,int f_in)
} }
if (remote_protocol < MIN_PROTOCOL_VERSION if (remote_protocol < MIN_PROTOCOL_VERSION
|| remote_protocol > MAX_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"); rprintf(FERROR,"(see the rsync man page for an explanation)\n");
exit_cleanup(RERR_PROTOCOL); exit_cleanup(RERR_PROTOCOL);
} }
......
...@@ -1690,7 +1690,7 @@ void delete_in_dir(struct file_list *flist, char *fname) ...@@ -1690,7 +1690,7 @@ void delete_in_dir(struct file_list *flist, char *fname)
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO, rprintf(FINFO,
"IO error encountered - skipping file deletion\n"); "IO error encountered -- skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */ max_delete = -1; /* avoid duplicating the above warning */
return; return;
} }
......
...@@ -149,7 +149,7 @@ static void check_timeout(void) ...@@ -149,7 +149,7 @@ static void check_timeout(void)
if (t - last_io >= io_timeout) { if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) { 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)); (int)(t-last_io));
} }
exit_cleanup(RERR_TIMEOUT); exit_cleanup(RERR_TIMEOUT);
......
...@@ -418,7 +418,7 @@ static void log_formatted(enum logcode code, ...@@ -418,7 +418,7 @@ static void log_formatted(enum logcode code,
l = strlen(n); l = strlen(n);
if (l + ((int)(s - &buf[0])) >= sizeof(buf)) { 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]); p[0]);
exit_cleanup(RERR_MESSAGEIO); exit_cleanup(RERR_MESSAGEIO);
} }
......
...@@ -62,7 +62,7 @@ void delete_files(struct file_list *flist) ...@@ -62,7 +62,7 @@ void delete_files(struct file_list *flist)
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO, rprintf(FINFO,
"IO error encountered - skipping file deletion\n"); "IO error encountered -- skipping file deletion\n");
return; return;
} }
......
...@@ -90,7 +90,7 @@ static int establish_proxy_connection(int fd, char *host, int port, ...@@ -90,7 +90,7 @@ static int establish_proxy_connection(int fd, char *host, int port,
if (*cp == '\r') if (*cp == '\r')
*cp = '\0'; *cp = '\0';
if (strncmp(buffer, "HTTP/", 5) != 0) { if (strncmp(buffer, "HTTP/", 5) != 0) {
rprintf(FERROR, "bad response from proxy - %s\n", rprintf(FERROR, "bad response from proxy -- %s\n",
buffer); buffer);
return -1; return -1;
} }
...@@ -98,7 +98,7 @@ static int establish_proxy_connection(int fd, char *host, int port, ...@@ -98,7 +98,7 @@ static int establish_proxy_connection(int fd, char *host, int port,
while (*cp == ' ') while (*cp == ' ')
cp++; cp++;
if (*cp != '2') { if (*cp != '2') {
rprintf(FERROR, "bad response from proxy - %s\n", rprintf(FERROR, "bad response from proxy -- %s\n",
buffer); buffer);
return -1; return -1;
} }
...@@ -616,7 +616,7 @@ void set_socket_options(int fd, char *options) ...@@ -616,7 +616,7 @@ void set_socket_options(int fd, char *options)
case OPT_ON: case OPT_ON:
if (got_value) 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; int on = socket_options[i].value;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment