update generated files

bk: 49212b66G-0uH6tNiryuf5EG3P5-rA

diff --git a/gsoc_sntp/sntp-opts.c b/gsoc_sntp/sntp-opts.c
index 83a5b61a96d1729b47e34664837bbf3f77f7d968..02e270c3c915bda86124b36ffcf20a0a04e502c5 100644 (file)
--- a/gsoc_sntp/sntp-opts.c
+++ b/gsoc_sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday November 16, 2008 at 07:00:58 AM EST
+ *  It has been AutoGen-ed  Monday November 17, 2008 at 03:26:32 AM EST
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -181,7 +181,7 @@ tSCC    zKeyfile_Name[]            = "keyfile";
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Help/More_Help/Version option descriptions:
+ *  Help/More_Help option descriptions:
  */
 tSCC zHelpText[]       = "Display usage information and exit";
 tSCC zHelp_Name[]      = "help";
@@ -189,9 +189,6 @@ tSCC zHelp_Name[]      = "help";
 tSCC zMore_HelpText[]  = "Extended usage information passed thru pager";
 tSCC zMore_Help_Name[] = "more-help";
 
-tSCC zVersionText[]    = "Output version information and exit";
-tSCC zVersion_Name[]   = "version";
-
 /*
  *  Save/Load_Opts option description:
  */
@@ -213,7 +210,7 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
  *  if multiple copies are allowed.
  */
 extern tOptProc
-    optionNumericVal, optionPagedUsage, optionVersionStderr;
+    optionNumericVal, optionPagedUsage;
 static tOptProc
     doUsageOpt;
 
@@ -222,15 +219,10 @@ static tOptProc
  *  When not under test, there are different procs to use
  */
 extern tOptProc
-    optionNumericVal, optionPagedUsage, optionPrintVersion;
+    optionNumericVal, optionPagedUsage;
 static tOptProc
     doUsageOpt;
 #endif /* defined(TEST_SNTP_OPTS) */
-#ifdef TEST_SNTP_OPTS
-# define DOVERPROC optionVersionStderr
-#else
-# define DOVERPROC optionPrintVersion
-#endif /* TEST_SNTP_OPTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -381,28 +373,6 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name,
      /* disablement strs */ NULL, NULL },
 
-#ifdef NO_OPTIONAL_OPT_ARGS
-#  define VERSION_OPT_FLAGS     OPTST_IMM | OPTST_NO_INIT
-#else
-#  define VERSION_OPT_FLAGS     OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
-                                OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
-#endif
-
-  {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
-     /* equiv idx value  */ NO_EQUIVALENT, 0,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ VERSION_OPT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ DOVERPROC,
-     /* desc, NAME, name */ zVersionText, NULL, zVersion_Name,
-     /* disablement strs */ NULL, NULL },
-
-#undef VERSION_OPT_FLAGS
-
-
   {  /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -460,7 +430,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p142\n\
+"sntp - standard SNTP program\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... ...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -479,7 +449,7 @@ run as an interactive command or in a\n\
 job.\n\
 NTP is the Network Time Protocol (RFC 1305) and SNTP is the\n\
 Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769).\n";
-tSCC    zFullVersion[] = SNTP_FULL_VERSION;
+#define zFullVersion    NULL
 /* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */
 
 #if defined(ENABLE_NLS)
@@ -518,7 +488,7 @@ tOptions sntpOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    17 /* full option count */, 12 /* user option count */
+    16 /* full option count */, 12 /* user option count */
 };
 
 /*

diff --git a/gsoc_sntp/sntp-opts.h b/gsoc_sntp/sntp-opts.h
index 554064b1b615a2573f0be529ed9e7b4cd34d5e6f..13dc868a82241de3b661fd5a984390ff22b41065 100644 (file)
--- a/gsoc_sntp/sntp-opts.h
+++ b/gsoc_sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday November 16, 2008 at 07:00:57 AM EST
+ *  It has been AutoGen-ed  Monday November 17, 2008 at 03:26:32 AM EST
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -64,16 +64,13 @@ typedef enum {
         INDEX_OPT_TIMEOUT          =  9,
         INDEX_OPT_AUTHENTICATION   = 10,
         INDEX_OPT_KEYFILE          = 11,
-        INDEX_OPT_VERSION          = 12,
-        INDEX_OPT_HELP             = 13,
-        INDEX_OPT_MORE_HELP        = 14,
-        INDEX_OPT_SAVE_OPTS        = 15,
-        INDEX_OPT_LOAD_OPTS        = 16
+        INDEX_OPT_HELP             = 12,
+        INDEX_OPT_MORE_HELP        = 13,
+        INDEX_OPT_SAVE_OPTS        = 14,
+        INDEX_OPT_LOAD_OPTS        = 15
 } teOptIndex;
 
-#define OPTION_CT    17
-#define SNTP_VERSION       "4.2.5p142"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p142"
+#define OPTION_CT    16
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -96,73 +93,6 @@ typedef enum {
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
 
-/*
- *  Make sure there are no #define name conflicts with the option names
- */
-#ifndef     NO_OPTION_NAME_WARNINGS
-# ifdef    IPV4
-#  warning undefining IPV4 due to option name conflict
-#  undef   IPV4
-# endif
-# ifdef    IPV6
-#  warning undefining IPV6 due to option name conflict
-#  undef   IPV6
-# endif
-# ifdef    NORMALVERBOSE
-#  warning undefining NORMALVERBOSE due to option name conflict
-#  undef   NORMALVERBOSE
-# endif
-# ifdef    KOD
-#  warning undefining KOD due to option name conflict
-#  undef   KOD
-# endif
-# ifdef    SYSLOG
-#  warning undefining SYSLOG due to option name conflict
-#  undef   SYSLOG
-# endif
-# ifdef    FILELOG
-#  warning undefining FILELOG due to option name conflict
-#  undef   FILELOG
-# endif
-# ifdef    SETTOD
-#  warning undefining SETTOD due to option name conflict
-#  undef   SETTOD
-# endif
-# ifdef    ADJTIME
-#  warning undefining ADJTIME due to option name conflict
-#  undef   ADJTIME
-# endif
-# ifdef    BROADCAST
-#  warning undefining BROADCAST due to option name conflict
-#  undef   BROADCAST
-# endif
-# ifdef    TIMEOUT
-#  warning undefining TIMEOUT due to option name conflict
-#  undef   TIMEOUT
-# endif
-# ifdef    AUTHENTICATION
-#  warning undefining AUTHENTICATION due to option name conflict
-#  undef   AUTHENTICATION
-# endif
-# ifdef    KEYFILE
-#  warning undefining KEYFILE due to option name conflict
-#  undef   KEYFILE
-# endif
-#else  /* NO_OPTION_NAME_WARNINGS */
-# undef IPV4
-# undef IPV6
-# undef NORMALVERBOSE
-# undef KOD
-# undef SYSLOG
-# undef FILELOG
-# undef SETTOD
-# undef ADJTIME
-# undef BROADCAST
-# undef TIMEOUT
-# undef AUTHENTICATION
-# undef KEYFILE
-#endif  /*  NO_OPTION_NAME_WARNINGS */
-
 /*
  *  Interface defines for specific options.
  */
@@ -170,7 +100,7 @@ typedef enum {
 #define WHICH_OPT_IPV4           (DESC(IPV4).optActualValue)
 #define WHICH_IDX_IPV4           (DESC(IPV4).optActualIndex)
 #define VALUE_OPT_IPV6           '6'
-#define VALUE_OPT_NORMALVERBOSE  'v'
+#define VALUE_OPT_NORMALVERBOSE  'd'
 #define VALUE_OPT_KOD            'K'
 #define VALUE_OPT_SYSLOG         'p'
 #define VALUE_OPT_FILELOG        'l'
@@ -183,7 +113,6 @@ typedef enum {
 #define OPT_VALUE_AUTHENTICATION (DESC(AUTHENTICATION).optArg.argInt)
 #define VALUE_OPT_KEYFILE        'k'
 
-#define VALUE_OPT_VERSION       'v'
 #define VALUE_OPT_HELP          '?'
 #define VALUE_OPT_MORE_HELP     '!'
 #define VALUE_OPT_SAVE_OPTS     '>'

diff --git a/gsoc_sntp/sntp-opts.texi b/gsoc_sntp/sntp-opts.texi
index 1b8e0c8ed404e126e532cbb11ee661f349c661c5..ae1bc1d1daebada9ab1918109d4221051af2af53 100644 (file)
--- a/gsoc_sntp/sntp-opts.texi
+++ b/gsoc_sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday November 16, 2008 at 07:01:00 AM EST
+# It has been AutoGen-ed  Monday November 17, 2008 at 03:26:34 AM EST
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -36,7 +36,7 @@ This software is released under a specialized copyright license.
 * sntp ipv6::                   ipv6 option (-6)
 * sntp keyfile::                keyfile option (-k)
 * sntp kod::                    kod option (-K)
-* sntp normalverbose::          normalverbose option (-v)
+* sntp normalverbose::          normalverbose option (-d)
 * sntp settod::                 settod option (-s)
 * sntp syslog::                 syslog option (-p)
 * sntp timeout::                timeout option (-t)
@@ -85,7 +85,7 @@ Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 
 @node sntp normalverbose
-@subsection normalverbose option (-v)
+@subsection normalverbose option (-d)
 @cindex sntp-normalverbose
 
 This is the ``normal verbose'' option.

diff --git a/gsoc_sntp/sntp.1 b/gsoc_sntp/sntp.1
index fd1b1fd16b35c3c7953d56ef72647ab2e981f81c..e9d0c5fb4ac0a3068a96e929c6842b435c1284fa 100644 (file)
--- a/gsoc_sntp/sntp.1
+++ b/gsoc_sntp/sntp.1
@@ -1,7 +1,7 @@
-.TH SNTP 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual"
+.TH SNTP 1 2008-11-17 "" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday November 16, 2008 at 07:00:59 AM EST
+.\"  It has been AutoGen-ed  Monday November 17, 2008 at 03:26:33 AM EST
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -168,7 +168,7 @@ This option is a member of the ipv4 class of options.
 Force DNS resolution of following host names on the command line
 to the IPv6 namespace.
 .TP
-.BR \-v ", " \--normalverbose
+.BR \-d ", " \--normalverbose
 Normal verbose.
 .sp
 Diagnostic messages for non-fatal errors and a limited amount of
@@ -264,11 +264,6 @@ Load options from \fIrcfile\fP.
 The \fIno-load-opts\fP form will disable the loading
 of earlier RC/INI files.  \fI--no-load-opts\fP is handled early,
 out of order.
-.TP
-.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]"
-Output version of program and exit.  The default mode is `v', a simple
-version.  The `c' mode will print copyright information and `n' will
-print the full copyright notice.
 .SH OPTION PRESETS
 Any option that is not marked as \fInot presettable\fP may be preset
 by loading values from configuration ("RC" or ".INI") file(s) and values from