From: Harlan Stenn Date: Fri, 8 Aug 2014 09:31:03 +0000 (+0000) Subject: autogen-5.18.4pre12 X-Git-Tag: NTP_4_2_7P457~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc14cb36f76109b65e94bb4ee9560cb0db0488b;p=thirdparty%2Fntp.git autogen-5.18.4pre12 bk: 53e498d7SB8fHaTo8dX6T0WQANYZTQ --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 61f6b0769..b653009b5 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed August 7, 2014 at 09:28:30 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:27 AM by AutoGen 5.18.4pre12 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3011] = -/* 0 */ "ntpd 4.2.7p456\n" +/* 0 */ "ntpd 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -201,12 +201,12 @@ static char const ntpd_opt_strs[3011] = /* 2778 */ "output version information and exit\0" /* 2814 */ "version\0" /* 2822 */ "NTPD\0" -/* 2827 */ "ntpd - NTP daemon program - Ver. 4.2.7p456\n" +/* 2827 */ "ntpd - NTP daemon program - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p456"; +/* 2996 */ "ntpd 4.2.7p454"; /** * ipv4 option description with @@ -1558,7 +1558,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p456\n\ + puts(_("ntpd 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1695,7 +1695,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.7p456\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1703,7 +1703,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p456")); + puts(_("ntpd 4.2.7p454")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index d2ae356ac..7222c6739 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed August 7, 2014 at 09:28:28 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:27 AM by AutoGen 5.18.4pre12 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.7p456" +#define NTPD_VERSION "4.2.7p454" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p456" +#define NTPD_FULL_VERSION "ntpd 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -379,11 +379,11 @@ typedef enum { #define VALUE_OPT_USEPCC 0x1004 #define VALUE_OPT_PCCFREQ 0x1005 #define VALUE_OPT_MDNS 'm' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1006 /* * Interface defines not associated with particular options @@ -416,11 +416,11 @@ extern tOptions ntpdOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz); diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index e3655be13..ab5d5250e 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * It has been AutoGen-ed July 20, 2014 at 08:20:33 AM by AutoGen 5.18.4pre9 + * It has been AutoGen-ed August 8, 2014 at 09:04:31 AM by AutoGen 5.18.4pre12 * From the definitions ntpdsim-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpdsim options */ static char const ntpdsim_opt_strs[3124] = -/* 0 */ "ntpdsim 4.2.7p453\n" +/* 0 */ "ntpdsim 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -207,14 +207,14 @@ static char const ntpdsim_opt_strs[3124] = /* 2916 */ "no-load-opts\0" /* 2929 */ "no\0" /* 2932 */ "NTPDSIM\0" -/* 2940 */ "ntpdsim - NTP daemon simulation program - Ver. 4.2.7p453\n" +/* 2940 */ "ntpdsim - NTP daemon simulation program - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" /* 3055 */ "$HOME\0" /* 3061 */ ".\0" /* 3063 */ ".ntprc\0" /* 3070 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3104 */ "\n\0" -/* 3106 */ "ntpdsim 4.2.7p453"; +/* 3106 */ "ntpdsim 4.2.7p454"; /** * ipv4 option description with @@ -1603,7 +1603,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdsimOptions.pzCopyright */ - puts(_("ntpdsim 4.2.7p453\n\ + puts(_("ntpdsim 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1746,14 +1746,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpdsimOptions.pzUsageTitle */ - puts(_("ntpdsim - NTP daemon simulation program - Ver. 4.2.7p453\n\ + puts(_("ntpdsim - NTP daemon simulation program - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntpdsimOptions.pzDetail */ puts(_("\n")); /* referenced via ntpdsimOptions.pzFullVersion */ - puts(_("ntpdsim 4.2.7p453")); + puts(_("ntpdsim 4.2.7p454")); /* referenced via ntpdsimOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 23d6faf6f..0d29fa0cf 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * It has been AutoGen-ed July 20, 2014 at 08:20:33 AM by AutoGen 5.18.4pre9 + * It has been AutoGen-ed August 8, 2014 at 09:04:31 AM by AutoGen 5.18.4pre12 * From the definitions ntpdsim-opts.def * and the template file options * @@ -107,9 +107,9 @@ typedef enum { /** count of all options for ntpdsim */ #define OPTION_CT 39 /** ntpdsim version */ -#define NTPDSIM_VERSION "4.2.7p453" +#define NTPDSIM_VERSION "4.2.7p454" /** Full ntpdsim version text */ -#define NTPDSIM_FULL_VERSION "ntpdsim 4.2.7p453" +#define NTPDSIM_FULL_VERSION "ntpdsim 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index f11eb7999..02ff6c37b 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed August 7, 2014 at 09:31:31 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:35 AM by AutoGen 5.18.4pre12 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -69,7 +69,7 @@ extern FILE * option_usage_fp; * static const strings for ntpdc options */ static char const ntpdc_opt_strs[1861] = -/* 0 */ "ntpdc 4.2.7p456\n" +/* 0 */ "ntpdc 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -127,14 +127,14 @@ static char const ntpdc_opt_strs[1861] = /* 1640 */ "no-load-opts\0" /* 1653 */ "no\0" /* 1656 */ "NTPDC\0" -/* 1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p456\n" +/* 1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" /* 1794 */ "$HOME\0" /* 1800 */ ".\0" /* 1802 */ ".ntprc\0" /* 1809 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 1843 */ "\n\0" -/* 1845 */ "ntpdc 4.2.7p456"; +/* 1845 */ "ntpdc 4.2.7p454"; /** * ipv4 option description with @@ -852,7 +852,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdcOptions.pzCopyright */ - puts(_("ntpdc 4.2.7p456\n\ + puts(_("ntpdc 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -917,14 +917,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpdcOptions.pzUsageTitle */ - puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p456\n\ + puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpdcOptions.pzExplain */ puts(_("\n")); /* referenced via ntpdcOptions.pzFullVersion */ - puts(_("ntpdc 4.2.7p456")); + puts(_("ntpdc 4.2.7p454")); /* referenced via ntpdcOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index bd8c21891..4eca5d778 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed August 7, 2014 at 09:31:30 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:35 AM by AutoGen 5.18.4pre12 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -83,9 +83,9 @@ typedef enum { /** count of all options for ntpdc */ #define OPTION_CT 15 /** ntpdc version */ -#define NTPDC_VERSION "4.2.7p456" +#define NTPDC_VERSION "4.2.7p454" /** Full ntpdc version text */ -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p456" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -207,15 +207,15 @@ typedef enum { #define VALUE_OPT_NUMERIC 'n' #define VALUE_OPT_PEERS 'p' #define VALUE_OPT_SHOWPEERS 's' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1001 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for save-opts-value option */ #define VALUE_OPT_SAVE_OPTS '>' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for load-opts-value option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -252,11 +252,11 @@ extern tOptions ntpdcOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz); diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index bbc578073..bb91d949f 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed August 7, 2014 at 09:31:53 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:37 AM by AutoGen 5.18.4pre12 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -69,7 +69,7 @@ extern FILE * option_usage_fp; * static const strings for ntpq options */ static char const ntpq_opt_strs[1833] = -/* 0 */ "ntpq 4.2.7p456\n" +/* 0 */ "ntpq 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -125,13 +125,13 @@ static char const ntpq_opt_strs[1833] = /* 1627 */ "no-load-opts\0" /* 1640 */ "no\0" /* 1643 */ "NTPQ\0" -/* 1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p456\n" +/* 1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" /* 1769 */ "$HOME\0" /* 1775 */ ".\0" /* 1777 */ ".ntprc\0" /* 1784 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 1818 */ "ntpq 4.2.7p456"; +/* 1818 */ "ntpq 4.2.7p454"; /** * ipv4 option description with @@ -822,7 +822,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpqOptions.pzCopyright */ - puts(_("ntpq 4.2.7p456\n\ + puts(_("ntpq 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -884,11 +884,11 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpqOptions.pzUsageTitle */ - puts(_("ntpq - standard NTP query program - Ver. 4.2.7p456\n\ + puts(_("ntpq - standard NTP query program - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpqOptions.pzFullVersion */ - puts(_("ntpq 4.2.7p456")); + puts(_("ntpq 4.2.7p454")); /* referenced via ntpqOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 6f60392fd..a4e8d43f3 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed August 7, 2014 at 09:31:52 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:37 AM by AutoGen 5.18.4pre12 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -82,9 +82,9 @@ typedef enum { /** count of all options for ntpq */ #define OPTION_CT 14 /** ntpq version */ -#define NTPQ_VERSION "4.2.7p456" +#define NTPQ_VERSION "4.2.7p454" /** Full ntpq version text */ -#define NTPQ_FULL_VERSION "ntpq 4.2.7p456" +#define NTPQ_FULL_VERSION "ntpq 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -200,15 +200,15 @@ typedef enum { #define VALUE_OPT_INTERACTIVE 'i' #define VALUE_OPT_NUMERIC 'n' #define VALUE_OPT_OLD_RV 0x1001 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1002 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for save-opts-value option */ #define VALUE_OPT_SAVE_OPTS '>' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for load-opts-value option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -245,11 +245,11 @@ extern tOptions ntpqOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz); diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 2baf56d05..aba9f7e5c 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed August 7, 2014 at 09:32:28 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:39 AM by AutoGen 5.18.4pre12 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -61,7 +61,7 @@ extern FILE * option_usage_fp; * static const strings for ntpsnmpd options */ static char const ntpsnmpd_opt_strs[1560] = -/* 0 */ "ntpsnmpd 4.2.7p456\n" +/* 0 */ "ntpsnmpd 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -100,14 +100,14 @@ static char const ntpsnmpd_opt_strs[1560] = /* 1360 */ "no-load-opts\0" /* 1373 */ "no\0" /* 1376 */ "NTPSNMPD\0" -/* 1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p456\n" +/* 1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" /* 1490 */ "$HOME\0" /* 1496 */ ".\0" /* 1498 */ ".ntprc\0" /* 1505 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 1539 */ "\n\0" -/* 1541 */ "ntpsnmpd 4.2.7p456"; +/* 1541 */ "ntpsnmpd 4.2.7p454"; /** * nofork option description: @@ -595,7 +595,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpsnmpdOptions.pzCopyright */ - puts(_("ntpsnmpd 4.2.7p456\n\ + puts(_("ntpsnmpd 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -639,14 +639,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpsnmpdOptions.pzUsageTitle */ - puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p456\n\ + puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntpsnmpdOptions.pzExplain */ puts(_("\n")); /* referenced via ntpsnmpdOptions.pzFullVersion */ - puts(_("ntpsnmpd 4.2.7p456")); + puts(_("ntpsnmpd 4.2.7p454")); /* referenced via ntpsnmpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 2c75513a2..10ba477dd 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed August 7, 2014 at 09:32:27 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:39 AM by AutoGen 5.18.4pre12 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -76,9 +76,9 @@ typedef enum { /** count of all options for ntpsnmpd */ #define OPTION_CT 8 /** ntpsnmpd version */ -#define NTPSNMPD_VERSION "4.2.7p456" +#define NTPSNMPD_VERSION "4.2.7p454" /** Full ntpsnmpd version text */ -#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.7p456" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -156,15 +156,15 @@ typedef enum { #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_SYSLOG 'p' #define VALUE_OPT_AGENTXSOCKET 0x1001 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1002 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for save-opts-value option */ #define VALUE_OPT_SAVE_OPTS '>' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for load-opts-value option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -201,11 +201,11 @@ extern tOptions ntpsnmpdOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz); diff --git a/scripts/calc_tickadj/calc_tickadj-opts b/scripts/calc_tickadj/calc_tickadj-opts index f23907c90..47fb5d8fe 100644 --- a/scripts/calc_tickadj/calc_tickadj-opts +++ b/scripts/calc_tickadj/calc_tickadj-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (calc_tickadj-opts) # -# It has been AutoGen-ed July 20, 2014 at 08:20:40 AM by AutoGen 5.18.4pre9 +# It has been AutoGen-ed August 8, 2014 at 09:04:41 AM by AutoGen 5.18.4pre12 # From the definitions calc_tickadj-opts.def # and the template file perlopt @@ -39,7 +39,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -calc_tickadj - Calculates "optimal" value for tick given ntp drift file. - Ver. 4.2.7p453 +calc_tickadj - Calculates "optimal" value for tick given ntp drift file. - Ver. 4.2.7p454 USAGE: calc_tickadj [ - [] | --[{=| }] ]... -d, --drift-file=str Ntp drift file to use diff --git a/scripts/ntpsweep/ntpsweep-opts b/scripts/ntpsweep/ntpsweep-opts index fae87c7c6..819e3e4a6 100644 --- a/scripts/ntpsweep/ntpsweep-opts +++ b/scripts/ntpsweep/ntpsweep-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (ntpsweep-opts) # -# It has been AutoGen-ed July 20, 2014 at 08:20:40 AM by AutoGen 5.18.4pre9 +# It has been AutoGen-ed August 8, 2014 at 09:04:41 AM by AutoGen 5.18.4pre12 # From the definitions ntpsweep-opts.def # and the template file perlopt @@ -43,7 +43,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -ntpsweep - Print various informations about given ntp servers - Ver. 4.2.7p453 +ntpsweep - Print various informations about given ntp servers - Ver. 4.2.7p454 USAGE: ntpsweep [ - [] | --[{=| }] ]... [hostfile] -l, --host-list=str Host to execute actions on diff --git a/scripts/ntptrace/ntptrace-opts b/scripts/ntptrace/ntptrace-opts index 702f4dd40..57e0a502a 100644 --- a/scripts/ntptrace/ntptrace-opts +++ b/scripts/ntptrace/ntptrace-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (ntptrace-opts) # -# It has been AutoGen-ed July 20, 2014 at 08:20:40 AM by AutoGen 5.18.4pre9 +# It has been AutoGen-ed August 8, 2014 at 09:04:41 AM by AutoGen 5.18.4pre12 # From the definitions ntptrace-opts.def # and the template file perlopt @@ -40,7 +40,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -ntptrace - Trace peers of an NTP server - Ver. 4.2.7p453 +ntptrace - Trace peers of an NTP server - Ver. 4.2.7p454 USAGE: ntptrace [ - [] | --[{=| }] ]... [host] -n, --numeric Print IP addresses instead of hostnames diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts index 2556b02a0..f45b4ca7e 100644 --- a/scripts/plot_summary-opts +++ b/scripts/plot_summary-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (plot_summary-opts) # -# It has been AutoGen-ed July 20, 2014 at 08:20:40 AM by AutoGen 5.18.4pre9 +# It has been AutoGen-ed August 8, 2014 at 09:04:41 AM by AutoGen 5.18.4pre12 # From the definitions plot_summary-opts.def # and the template file perlopt @@ -46,7 +46,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -plot_summary - plot statistics generated by summary script - Ver. 4.2.7p453 +plot_summary - plot statistics generated by summary script - Ver. 4.2.7p454 USAGE: plot_summary [ - [] | --[{=| }] ]... --directory=str Where the summary files are diff --git a/scripts/summary-opts b/scripts/summary-opts index 2e7cb8429..94e4765b3 100644 --- a/scripts/summary-opts +++ b/scripts/summary-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (summary-opts) # -# It has been AutoGen-ed July 20, 2014 at 08:20:40 AM by AutoGen 5.18.4pre9 +# It has been AutoGen-ed August 8, 2014 at 09:04:42 AM by AutoGen 5.18.4pre12 # From the definitions summary-opts.def # and the template file perlopt @@ -44,7 +44,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -summary - compute various stastics from NTP stat files - Ver. 4.2.7p453 +summary - compute various stastics from NTP stat files - Ver. 4.2.7p454 USAGE: summary [ - [] | --[{=| }] ]... --directory=str Directory containing stat files diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index dc3a580ad..627b5397d 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed August 7, 2014 at 09:32:46 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:45 AM by AutoGen 5.18.4pre12 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -72,7 +72,7 @@ extern FILE * option_usage_fp; * static const strings for ntp-keygen options */ static char const ntp_keygen_opt_strs[2369] = -/* 0 */ "ntp-keygen (ntp) 4.2.7p456\n" +/* 0 */ "ntp-keygen (ntp) 4.2.7p454\n" "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -163,14 +163,14 @@ static char const ntp_keygen_opt_strs[2369] = /* 2148 */ "no-load-opts\0" /* 2161 */ "no\0" /* 2164 */ "NTP_KEYGEN\0" -/* 2175 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p456\n" +/* 2175 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p454\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" /* 2291 */ "$HOME\0" /* 2297 */ ".\0" /* 2299 */ ".ntprc\0" /* 2306 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2340 */ "\n\0" -/* 2342 */ "ntp-keygen (ntp) 4.2.7p456"; +/* 2342 */ "ntp-keygen (ntp) 4.2.7p454"; /** * imbits option description: @@ -1365,7 +1365,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntp_keygenOptions.pzCopyright */ - puts(_("ntp-keygen (ntp) 4.2.7p456\n\ + puts(_("ntp-keygen (ntp) 4.2.7p454\n\ Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1463,14 +1463,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntp_keygenOptions.pzUsageTitle */ - puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p456\n\ + puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p454\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntp_keygenOptions.pzExplain */ puts(_("\n")); /* referenced via ntp_keygenOptions.pzFullVersion */ - puts(_("ntp-keygen (ntp) 4.2.7p456")); + puts(_("ntp-keygen (ntp) 4.2.7p454")); /* referenced via ntp_keygenOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index bdd28bdd7..2a7f1ebf4 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed August 7, 2014 at 09:32:45 AM by AutoGen 5.18.3pre18 + * It has been AutoGen-ed August 8, 2014 at 09:04:45 AM by AutoGen 5.18.4pre12 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 40:2:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -53,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163842 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -94,9 +94,9 @@ typedef enum { /** count of all options for ntp-keygen */ #define OPTION_CT 26 /** ntp-keygen version */ -#define NTP_KEYGEN_VERSION "4.2.7p456" +#define NTP_KEYGEN_VERSION "4.2.7p454" /** Full ntp-keygen version text */ -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.7p456" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.7p454" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -299,15 +299,15 @@ typedef enum { #ifdef AUTOKEY #define OPT_VALUE_MV_KEYS (DESC(MV_KEYS).optArg.argInt) #endif /* AUTOKEY */ -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1001 -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for save-opts-value option */ #define VALUE_OPT_SAVE_OPTS '>' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for load-opts-value option */ #define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ @@ -344,11 +344,11 @@ extern tOptions ntp_keygenOptions; # include # endif -# ifndef __attribute__ -# define __attribute__(_a) +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) # endif -static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz);