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

Harlan Stenn stenn at deacon.udel.edu
Thu Aug 2 05:17:22 UTC 2012


#### ChangeSet ####
2012-08-01 21:26:07-04:00, stenn at psp-deb1.ntp.org
  [Bug 2075] Fix spelling of 'incompatible'

==== ChangeLog ====
2012-08-01 21:25:46-04:00, stenn at psp-deb1.ntp.org +1 -0
  [Bug 2075] Fix spelling of 'incompatible'

--- 1.1198/ChangeLog	2012-07-31 07:34:54 -04:00
+++ 1.1199/ChangeLog	2012-08-01 21:25:46 -04:00
@@ -1,3 +1,4 @@
+* [Bug 2075] Fix spelling of 'incompatible'.
 (4.2.7p291) 2012/07/31 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2241] MDNS registration should only happen if requested.
 (4.2.7p290) 2012/07/20 Released by Harlan Stenn <stenn at ntp.org>

==== include/ntp_request.h ====
2012-08-01 21:25:46-04:00, stenn at psp-deb1.ntp.org +2 -2
  [Bug 2075] Fix spelling of 'incompatible'

--- 1.46/include/ntp_request.h	2012-06-18 01:01:48 -04:00
+++ 1.47/include/ntp_request.h	2012-08-01 21:25:46 -04:00
@@ -69,7 +69,7 @@
  *		requested wasn't performed.
  *
  *		0 - no error
- *		1 - incompatable implementation number
+ *		1 - incompatible implementation number
  *		2 - unimplemented request code
  *		3 - format error (wrong data items, data size, packet size etc.)
  *		4 - no data available (e.g. request for details on unknown peer)
@@ -190,7 +190,7 @@ struct resp_pkt {
  * Information error codes
  */
 #define	INFO_OKAY	0
-#define	INFO_ERR_IMPL	1	/* incompatable implementation */
+#define	INFO_ERR_IMPL	1	/* incompatible implementation */
 #define	INFO_ERR_REQ	2	/* unknown request code */
 #define	INFO_ERR_FMT	3	/* format error */
 #define	INFO_ERR_NODATA	4	/* no data for this request */

==== ntpdc/ntpdc.c ====
2012-08-01 21:25:46-04:00, stenn at psp-deb1.ntp.org +1 -1
  [Bug 2075] Fix spelling of 'incompatible'

--- 1.99/ntpdc/ntpdc.c	2012-02-27 18:05:09 -05:00
+++ 1.100/ntpdc/ntpdc.c	2012-08-01 21:25:46 -04:00
@@ -1029,7 +1029,7 @@ again:
 			if (implcode == IMPL_XNTPD)
 				break;
 			(void) fprintf(stderr,
-				       "***Server implementation incompatable with our own\n");
+				       "***Server implementation incompatible with our own\n");
 			break;
 		case INFO_ERR_REQ:
 			(void) fprintf(stderr,


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