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

Harlan Stenn stenn at whimsy.udel.edu
Fri Oct 19 07:04:12 UTC 2007


#### ChangeSet ####
2007-10-19 06:57:12+00:00, stenn at ntp1.isc.org 
  -ledit cleanup for ntpdc and ntpq.

==== ChangeLog ====
2007-10-19 06:57:04+00:00, stenn at ntp1.isc.org +1 -0
  -ledit cleanup for ntpdc and ntpq.

--- 1.128/ChangeLog	2007-10-18 01:52:32 -04:00
+++ 1.129/ChangeLog	2007-10-19 02:57:04 -04:00
@@ -1,3 +1,4 @@
+* -ledit cleanup for ntpdc and ntpq.
 * Association and other cleanup from Dave Mills.
 * NTP_UNREACH changes from Dave Mills.
 * Fix the readline history test.

==== ntpdc/ntpdc.c ====
2007-10-19 06:57:00+00:00, stenn at ntp1.isc.org +3 -3
  -ledit cleanup for ntpdc and ntpq.

--- 1.57/ntpdc/ntpdc.c	2007-10-15 04:48:55 -04:00
+++ 1.58/ntpdc/ntpdc.c	2007-10-19 02:57:00 -04:00
@@ -32,7 +32,7 @@
 #endif /* HAVE_LIBREADLINE */
 
 #if defined (HAVE_LIBEDIT)
-# include <editline/readline.h>
+# include <histedit.h>
 #endif /* HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
@@ -1132,7 +1132,7 @@ again:
 static void
 getcmds(void)
 {
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+#if defined(HAVE_LIBREADLINE)
 	char *line;
 
 	for (;;) {
@@ -1141,7 +1141,7 @@ getcmds(void)
 		docmd(line);
 		free(line);
 	}
-#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
+#else /* not (HAVE_LIBREADLINE) */
 	char line[MAXLINE];
 
 	for (;;) {

==== ntpq/ntpq.c ====
2007-10-19 06:56:53+00:00, stenn at ntp1.isc.org +3 -3
  -ledit cleanup for ntpdc and ntpq.

--- 1.71/ntpq/ntpq.c	2007-10-15 04:49:03 -04:00
+++ 1.72/ntpq/ntpq.c	2007-10-19 02:56:53 -04:00
@@ -37,7 +37,7 @@
 #endif /* HAVE_LIBREADLINE */
 
 #if defined(HAVE_LIBEDIT)
-# include <editline/readline.h>
+# include <histedit.h>
 #endif /* HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
@@ -1396,7 +1396,7 @@ doquery(
 static void
 getcmds(void)
 {
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+#if defined(HAVE_LIBREADLINE)
         char *line;
 
         for (;;) {
@@ -1405,7 +1405,7 @@ getcmds(void)
                 docmd(line);
                 free(line);
         }
-#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
+#else /* not (HAVE_LIBREADLINE) */
         char line[MAXLINE];
 
         for (;;) {


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