[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  47351c2b Use RSYNC_GITVER in more output
      from  16b76706 A couple more mkgitver tweaks

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


- Log -----------------------------------------------------------------
commit 47351c2b162fa8078d139be25b9296e156f2423f
Author: Wayne Davison <wayne at opencoder.net>
Date:   Mon Aug 3 10:42:08 2020 -0700

    Use RSYNC_GITVER in more output

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

Summary of changes:
 clientserver.c | 2 +-
 log.c          | 4 ++--
 options.c      | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/clientserver.c b/clientserver.c
index 0f54dcab..48c15a60 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -1451,7 +1451,7 @@ int daemon_main(void)
 	log_init(0);
 
 	rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",
-		RSYNC_VERSION, rsync_port);
+		rsync_version(), rsync_port);
 	/* TODO: If listening on a particular address, then show that
 	 * address too.  In fact, why not just do getnameinfo on the
 	 * local address??? */
diff --git a/log.c b/log.c
index e641198c..062a930e 100644
--- a/log.c
+++ b/log.c
@@ -891,10 +891,10 @@ void log_exit(int code, const char *file, int line)
 		/* VANISHED is not an error, only a warning */
 		if (code == RERR_VANISHED) {
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, src_file(file), line, who_am_i(), RSYNC_VERSION);
+				name, code, src_file(file), line, who_am_i(), rsync_version());
 		} else {
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
-				name, code, src_file(file), line, who_am_i(), RSYNC_VERSION);
+				name, code, src_file(file), line, who_am_i(), rsync_version());
 		}
 	}
 }
diff --git a/options.c b/options.c
index 0e9f3db6..dc3dcee9 100644
--- a/options.c
+++ b/options.c
@@ -720,6 +720,11 @@ static void print_info_flags(enum logcode f)
 	}
 }
 
+const char *rsync_version(void)
+{
+	return RSYNC_GITVER;
+}
+
 static void print_rsync_version(enum logcode f)
 {
 	char tmpbuf[256], *subprotocol = "";
@@ -728,7 +733,7 @@ static void print_rsync_version(enum logcode f)
 	subprotocol = istring(".PR%d", SUBPROTOCOL_VERSION);
 #endif
 	rprintf(f, "%s  version %s  protocol version %d%s\n",
-		RSYNC_NAME, RSYNC_GITVER, PROTOCOL_VERSION, subprotocol);
+		RSYNC_NAME, rsync_version(), PROTOCOL_VERSION, subprotocol);
 
 	rprintf(f, "Copyright (C) 1996-" LATEST_YEAR " by Andrew Tridgell, Wayne Davison, and others.\n");
 	rprintf(f, "Web site: https://rsync.samba.org/\n");


-- 
The rsync repository.