[ntp:bk-ntp-stable-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Sun Feb 18 21:16:24 PST 2007


#### ChangeSet ####
2007-02-19 00:14:29-05:00, stenn at whimsy.udel.edu 
  [Bug 776] Remove unimplemented "rate" flag from ntpdate

==== ChangeLog ====
2007-02-19 00:14:19-05:00, stenn at whimsy.udel.edu +1 -0
  [Bug 776] Remove unimplemented "rate" flag from ntpdate

--- 1.8/ChangeLog	2007-02-04 22:53:22 -05:00
+++ 1.9/ChangeLog	2007-02-19 00:14:19 -05:00
@@ -1,4 +1,5 @@
 (4.2.4p1) Released by Harlan Stenn <stenn at ntp.org>
+* [Bug 776] Remove unimplemented "rate" flag from ntpdate.
 * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.
 * [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
 * [Bug 768] Fix io_setbclient() error message.

==== ntpdate/Makefile.am ====
2007-02-19 00:13:50-05:00, stenn at whimsy.udel.edu +1 -1
  [Bug 776] Remove unimplemented "rate" flag from ntpdate

--- 1.14/ntpdate/Makefile.am	2005-12-30 19:09:51 -05:00
+++ 1.15/ntpdate/Makefile.am	2007-02-19 00:13:50 -05:00
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=	../util/ansi2knr
+#AUTOMAKE_OPTIONS=	../util/ansi2knr
 
 bindir=		${exec_prefix}/${BINSUBDIR}
 #bin_PROGRAMS=	ntpdate ntptimeset

==== ntpdate/ntpdate.c ====
2007-02-19 00:13:51-05:00, stenn at whimsy.udel.edu +1 -21
  [Bug 776] Remove unimplemented "rate" flag from ntpdate

--- 1.59/ntpdate/ntpdate.c	2006-08-29 07:55:16 -04:00
+++ 1.60/ntpdate/ntpdate.c	2007-02-19 00:13:51 -05:00
@@ -159,11 +159,6 @@ int simple_query = 0;
 int unpriv_port = 0;
 
 /*
- * Time to spend measuring drift rate
- */
-int rate = 0;
-
-/*
  * Program name.
  */
 char *progname;
@@ -279,10 +274,6 @@ void clear_globals()
   unpriv_port = 0;
 
   /*
-   * Time to spend measuring drift rate
-   */
-  rate = 0;
-  /*
    * Systemwide parameters and flags
    */
   sys_numservers = 0;	  /* number of servers to poll */
@@ -432,17 +423,6 @@ ntpdatemain (
 		case 'q':
 			simple_query = 1;
 			break;
-		case 'r':
-			c = atoi(ntp_optarg);
-			if (c <= 0 || c > (60 * 60)) {
-				(void) fprintf(stderr,
-					   "%s: rate (%d) is invalid: 0 - %d\n",
-					   progname, c, (60 * 60));
-				errflg++;
-			} else {
-				rate = c;
-			}
-			break;
 		case 's':
 			syslogit = 1;
 			break;
@@ -474,7 +454,7 @@ ntpdatemain (
 	
 	if (errflg) {
 		(void) fprintf(stderr,
-		    "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
+		    "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-t timeo] server ...\n",
 		    progname);
 		exit(2);
 	}


More information about the bk-ntp-stable-send mailing list