[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  cdf58a7a Change alt_dest_name() to alt_dest_opt().
      from  1d6c9676 Change 3 alt-dest vars to just one + some defines.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cdf58a7aba23e31653661c950c2c870b96de08fa
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 13 12:04:13 2020 -0700

    Change alt_dest_name() to alt_dest_opt().

-----------------------------------------------------------------------

Summary of changes:
 compat.c  | 4 ++--
 main.c    | 4 ++--
 options.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/compat.c b/compat.c
index 19d054bf..e01adfbd 100644
--- a/compat.c
+++ b/compat.c
@@ -565,7 +565,7 @@ void setup_protocol(int f_out,int f_in)
 			rprintf(FERROR,
 			    "%s with --inplace requires protocol 29 or higher"
 			    " (negotiated %d).\n",
-			    alt_dest_name(0), protocol_version);
+			    alt_dest_opt(0), protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 
@@ -573,7 +573,7 @@ void setup_protocol(int f_out,int f_in)
 			rprintf(FERROR,
 			    "Using more than one %s option requires protocol"
 			    " 29 or higher (negotiated %d).\n",
-			    alt_dest_name(0), protocol_version);
+			    alt_dest_opt(0), protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 
diff --git a/main.c b/main.c
index 5ccfabe3..6f86eb90 100644
--- a/main.c
+++ b/main.c
@@ -833,9 +833,9 @@ static void check_alt_basis_dirs(void)
 			basis_dir[j] = bdir = new;
 		}
 		if (do_stat(bdir, &st) < 0)
-			rprintf(FWARNING, "%s arg does not exist: %s\n", alt_dest_name(0), bdir);
+			rprintf(FWARNING, "%s arg does not exist: %s\n", alt_dest_opt(0), bdir);
 		else if (!S_ISDIR(st.st_mode))
-			rprintf(FWARNING, "%s arg is not a dir: %s\n", alt_dest_name(0), bdir);
+			rprintf(FWARNING, "%s arg is not a dir: %s\n", alt_dest_opt(0), bdir);
 	}
 }
 
diff --git a/options.c b/options.c
index d865a8e1..a4f4262e 100644
--- a/options.c
+++ b/options.c
@@ -1297,7 +1297,7 @@ static void popt_unalias(poptContext con, const char *opt)
 	poptAddAlias(con, unalias, 0);
 }
 
-char *alt_dest_name(int type)
+char *alt_dest_opt(int type)
 {
 	if (!type)
 		type = alt_dest_type;
@@ -1699,7 +1699,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			if (alt_dest_type && alt_dest_type != want_dest_type) {
 				snprintf(err_buf, sizeof err_buf,
 					"ERROR: the %s option conflicts with the %s option\n",
-					alt_dest_name(want_dest_type), alt_dest_name(0));
+					alt_dest_opt(want_dest_type), alt_dest_opt(0));
 				return 0;
 			}
 			alt_dest_type = want_dest_type;
@@ -1707,7 +1707,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			if (basis_dir_cnt >= MAX_BASIS_DIRS) {
 				snprintf(err_buf, sizeof err_buf,
 					"ERROR: at most %d %s args may be specified\n",
-					MAX_BASIS_DIRS, alt_dest_name(0));
+					MAX_BASIS_DIRS, alt_dest_opt(0));
 				return 0;
 			}
 			/* We defer sanitizing this arg until we know what
@@ -2797,7 +2797,7 @@ void server_options(char **args, int *argc_p)
 			 *   option, so don't send it if client is the sender.
 			 */
 			for (i = 0; i < basis_dir_cnt; i++) {
-				args[ac++] = alt_dest_name(0);
+				args[ac++] = alt_dest_opt(0);
 				args[ac++] = basis_dir[i];
 			}
 		}


-- 
The rsync repository.