diff options
| author | Ben Finney <ben@benfinney.id.au> | 2016-03-04 16:40:09 +1100 |
|---|---|---|
| committer | Ben Finney <ben@benfinney.id.au> | 2016-03-04 16:40:09 +1100 |
| commit | 10855b451df848ac4baf0d597edfcfa0bca41277 (patch) | |
| tree | 77cf3d16fd404da0137d4a096daf54185b0c8a1d | |
| parent | 3265b3594b7b8405137e42fbd331bf3793b50651 (diff) | |
| download | infinitytier-10855b451df848ac4baf0d597edfcfa0bca41277.tar.gz infinitytier-10855b451df848ac4baf0d597edfcfa0bca41277.zip | |
Refactor the copyright notice text to a pre-processor directive.
| -rw-r--r-- | one.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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] <command/path> [<args>]"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 <command> [<args>]"ZT_EOL_S""ZT_EOL_S"Commands:"ZT_EOL_S,pn); fprintf(out," generate [<identity.secret>] [<identity.public>]"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()) |