From 10855b451df848ac4baf0d597edfcfa0bca41277 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 4 Mar 2016 16:40:09 +1100 Subject: Refactor the copyright notice text to a pre-processor directive. --- one.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/one.cpp b/one.cpp index e61bcc1a..7efc0fc7 100644 --- a/one.cpp +++ b/one.cpp @@ -70,6 +70,7 @@ using namespace ZeroTier; static OneService *volatile zt1Service = (OneService *)0; +#define COPYRIGHT_NOTICE "(c)2011-2015 ZeroTier, Inc." #define LICENSE_GRANT \ "Licensed under the GNU General Public License v3" ZT_EOL_S @@ -79,8 +80,9 @@ static OneService *volatile zt1Service = (OneService *)0; static void cliPrintHelp(const char *pn,FILE *out) { - fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S"(c)2011-2015 ZeroTier, Inc."ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); + fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); fprintf(out, + COPYRIGHT_NOTICE ZT_EOL_S LICENSE_GRANT ZT_EOL_S); fprintf(out,"Usage: %s [-switches] []"ZT_EOL_S""ZT_EOL_S,pn); fprintf(out,"Available switches:"ZT_EOL_S); @@ -554,8 +556,9 @@ static int cli(int argc,char **argv) static void idtoolPrintHelp(FILE *out,const char *pn) { - fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S"(c)2011-2015 ZeroTier, Inc."ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); + fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); fprintf(out, + COPYRIGHT_NOTICE ZT_EOL_S LICENSE_GRANT ZT_EOL_S); fprintf(out,"Usage: %s []"ZT_EOL_S""ZT_EOL_S"Commands:"ZT_EOL_S,pn); fprintf(out," generate [] []"ZT_EOL_S); @@ -896,8 +899,9 @@ static BOOL IsCurrentUserLocalAdministrator(void) static void printHelp(const char *cn,FILE *out) { - fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S"(c)2011-2015 ZeroTier, Inc."ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); + fprintf(out,"ZeroTier One version %d.%d.%d"ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION); fprintf(out, + COPYRIGHT_NOTICE ZT_EOL_S LICENSE_GRANT ZT_EOL_S); std::string updateUrl(OneService::autoUpdateUrl()); if (updateUrl.length()) -- cgit v1.2.3