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

Harlan Stenn stenn at whimsy.udel.edu
Mon May 29 01:20:39 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060526170821|58785
stenn at pogo.udel.edu|ChangeSet|20060529011330|58853

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.47/ntpdc/ntpdc.c	2006-03-19 22:14:25 -05:00
#+++ 1.48/ntpdc/ntpdc.c	2006-05-26 13:05:10 -04:00
#@@ -1324,6 +1324,9 @@
# /*
#  * getarg - interpret an argument token
#  *
#+ * string is always set.
#+ * type is set to the decoded type.
#+ *
#  * return:	 0 - failure
#  *		 1 - success
#  *		-1 - skip to next token
#@@ -1339,9 +1342,13 @@
# 	char *cp, *np;
# 	static const char *digits = "0123456789";
# 
#-	switch (code & ~OPT) {
#+	memset(argp, 0, sizeof(*argp));
#+
#+	argp->string = str;
#+	argp->type   = code & ~OPT;
#+
#+	switch (argp->type) {
# 	    case NTP_STR:
#-		argp->string = str;
# 		break;
# 	    case NTP_ADD:
# 		if (!strcmp("-6", str)) {
#
#--- 1.6/ntpdc/ntpdc.h	2006-02-23 21:10:25 -05:00
#+++ 1.7/ntpdc/ntpdc.h	2006-05-26 13:07:45 -04:00
#@@ -26,9 +26,11 @@
# #define IP_VERSION	0x5	/* IP version */
# 
# /*
#- * Arguments are returned in a union
#+ * Arguments are returned in a struct - no
#+ * union space saving is attempted. 
#  */
#-typedef union {
#+typedef struct {
#+	u_char type;
# 	char *string;
# 	long ival;
# 	u_long uval;
#

# Diff checksum=aac621fc


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060526110246|58614
D 1.1526.1.1 06/05/26 17:08:21+00:00 kardel at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntpdc.h:
c   bug 621
c   change arg_v to struct, add type field
c ntpdc.c:
c   bug 621
c   change arg_v to struct, add type field, initialize string member
c   always as the 'new' parsing code seems to make that previously
c   unfounded assumption.
K 58785
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpdc/ntpdc.c|19990526004819|01635|3aed0663 kardel at pogo.udel.edu|ntpdc/ntpdc.c|20060526170510|18658
> stenn at whimsy.udel.edu|ntpdc/ntpdc.h|19990526004820|01682|3e480692 kardel at pogo.udel.edu|ntpdc/ntpdc.h|20060526170745|61900

stenn at whimsy.udel.edu|ChangeSet|20060527110240|58682
D 1.1529 06/05/28 21:13:30-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://www.ntp.org/home/bk/ntp-dev
c into  pogo.udel.edu:/pogo/users/kardel/bugs/ntp-dev-621
i kardel at pogo.udel.edu|ChangeSet|20060526170821|58785
K 58853
M kardel at pogo.udel.edu|ChangeSet|20060526170821|58785
P ChangeSet
------------------------------------------------


== ntpdc/ntpdc.c ==
stenn at whimsy.udel.edu|ntpdc/ntpdc.c|19990526004819|01635|3aed0663
mayer at pogo.udel.edu|ntpdc/ntpdc.c|20060320031425|08493
D 1.48 06/05/26 17:05:10+00:00 kardel at pogo.udel.edu +9 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug 621
c change arg_v to struct, add type field, initialize string member
c always as the 'new' parsing code seems to make that previously
c unfounded assumption.
K 18658
O -rw-rw-r--
P ntpdc/ntpdc.c
------------------------------------------------

I1326 3
 * string is always set.
 * type is set to the decoded type.
 *
D1342 1
I1342 6
	memset(argp, 0, sizeof(*argp));
\
	argp->string = str;
	argp->type   = code & ~OPT;
\
	switch (argp->type) {
D1344 1

== ntpdc/ntpdc.h ==
stenn at whimsy.udel.edu|ntpdc/ntpdc.h|19990526004820|01682|3e480692
rayvt at pogo.udel.edu|ntpdc/ntpdc.h|20060224021025|56901
D 1.7 06/05/26 17:07:45+00:00 kardel at pogo.udel.edu +4 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug 621
c change arg_v to struct, add type field
K 61900
O -rw-rw-r--
P ntpdc/ntpdc.h
------------------------------------------------

D29 1
I29 2
 * Arguments are returned in a struct - no
 * union space saving is attempted. 
D31 1
I31 2
typedef struct {
	u_char type;

# Patch checksum=59d5136e


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