[ntp:bk-ntp-stable-send] BitKeeper patch
Harlan Stenn
stenn at whimsy.udel.edu
Sat Nov 29 16:20:02 PST 2003
This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20031130001851|16261
# 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: /backroom/ntp-stable
#
#--- 1.9/ntpd/refclock_neoclock4x.c Sun Jul 27 19:58:16 2003
#+++ 1.10/ntpd/refclock_neoclock4x.c Sat Nov 29 19:10:42 2003
#@@ -678,11 +678,9 @@
#
# if(NULL != out)
# {
#- static char outstatus[800]; /* status output buffer */
# char *tt;
# char tmpbuf[80];
#
#- outstatus[0] = '\0';
# out->kv_list = (struct ctl_var *)0;
# out->type = REFCLK_NEOCLOCK4X;
#
#
#--- 1.9/ntpd/refclock_hopfpci.c Fri May 9 21:45:52 2003
#+++ 1.10/ntpd/refclock_hopfpci.c Sat Nov 29 19:09:20 2003
#@@ -181,17 +181,11 @@
# struct peer *peer
# )
# {
#- struct refclockproc *pp;
#- register struct hopfpciTime *up;
#-
#- pp = peer->procptr;
#- up = (struct hopfpciTime *)pp->unitptr;
#
# #ifndef SYS_WINNT
# close(fd);
# #else
# CloseHopfDevice();
#-/* UnmapViewOfFile (up); */
# #endif
# }
#
#@@ -206,11 +200,9 @@
# )
# {
# struct refclockproc *pp;
#- register struct hopfpciTime *up;
# HOPFTIME m_time;
#
# pp = peer->procptr;
#- up = (struct hopfpciTime *)pp->unitptr;
#
# #ifndef SYS_WINNT
# ioctl(fd,HOPF_CLOCK_GET_UTC,&m_time);
#
#--- 1.31/ntpdc/ntpdc.c Sat Oct 11 03:54:51 2003
#+++ 1.32/ntpdc/ntpdc.c Sat Nov 29 19:14:57 2003
#@@ -502,6 +502,7 @@
# {
# int optionValue = SO_SYNCHRONOUS_NONALERT;
# int err;
#+
# err = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&optionValue, sizeof(optionValue));
# if (err != NO_ERROR) {
# (void) fprintf(stderr, "cannot open nonoverlapped sockets\n");
#@@ -1383,7 +1384,6 @@
# int af
# )
# {
#- int err;
# int sockaddr_len;
# struct addrinfo hints, *ai = NULL;
#
#@@ -1404,7 +1404,7 @@
# NI_NUMERICHOST);
# }
# return 1;
#- } else if ((err = getaddrinfo(hname, "ntp", &hints, &ai)) == 0) {
#+ } else if (getaddrinfo(hname, "ntp", &hints, &ai) == 0) {
# memmove((char *)num, ai->ai_addr, ai->ai_addrlen);
# if (fullhost != 0)
# (void) strcpy(fullhost, ai->ai_canonname);
#
#--- 1.44/ntpq/ntpq.c Wed Oct 22 11:12:09 2003
#+++ 1.45/ntpq/ntpq.c Sat Nov 29 19:16:56 2003
#@@ -684,6 +684,7 @@
# {
# int optionValue = SO_SYNCHRONOUS_NONALERT;
# int err;
#+
# err = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&optionValue, sizeof(optionValue));
# if (err != NO_ERROR) {
# (void) fprintf(stderr, "cannot open nonoverlapped sockets\n");
#@@ -1668,7 +1669,6 @@
# int af
# )
# {
#- int err;
# int sockaddr_len;
# struct addrinfo hints, *ai = NULL;
#
#@@ -1687,10 +1687,9 @@
# getnameinfo((struct sockaddr *)num, sockaddr_len,
# fullhost, sizeof(fullhost), NULL, 0,
# NI_NUMERICHOST);
#-
# }
# return 1;
#- } else if ((err = getaddrinfo(hname, "ntp", &hints, &ai)) == 0) {
#+ } else if (getaddrinfo(hname, "ntp", &hints, &ai) == 0) {
# memmove((char *)num, ai->ai_addr, ai->ai_addrlen);
# if (ai->ai_canonname != 0)
# (void) strcpy(fullhost, ai->ai_canonname);
#
# Diff checksum=8dc61f77
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031129235320|15471
D 1.1179 03/11/29 19:18:51-05:00 stenn at whimsy.udel.edu +4 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 255] Lint cleanup
K 16261
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/refclock_hopfpci.c|20010403071207|57105|c7f2df11 stenn at whimsy.udel.edu|ntpd/refclock_hopfpci.c|20031130000920|12332
> claas at webfix.linum.ein|ntpd/refclock_neoclock4x.c|20020718153839|63243|a6d74e1991445dfa stenn at whimsy.udel.edu|ntpd/refclock_neoclock4x.c|20031130001042|21810
> stenn at whimsy.udel.edu|ntpdc/ntpdc.c|19990526004819|01635|3aed0663 stenn at whimsy.udel.edu|ntpdc/ntpdc.c|20031130001457|14997
> stenn at whimsy.udel.edu|ntpq/ntpq.c|19990526004819|01635|3aed0663 stenn at whimsy.udel.edu|ntpq/ntpq.c|20031130001656|29491
== ntpd/refclock_neoclock4x.c ==
claas at webfix.linum.ein|ntpd/refclock_neoclock4x.c|20020718153839|63243|a6d74e1991445dfa
stenn at whimsy.udel.edu|ntpd/refclock_neoclock4x.c|20030727235816|28723
D 1.10 03/11/29 19:10:42-05:00 stenn at whimsy.udel.edu +0 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 255] Lint cleanup in neoclock4x
K 21810
O -rw-rw-r--
P ntpd/refclock_neoclock4x.c
------------------------------------------------
D681 1
D685 1
== ntpd/refclock_hopfpci.c ==
stenn at whimsy.udel.edu|ntpd/refclock_hopfpci.c|20010403071207|57105|c7f2df11
mayer at tecotoo.myibg.com|ntpd/refclock_hopfpci.c|20030510014552|31955
D 1.10 03/11/29 19:09:20-05:00 stenn at whimsy.udel.edu +0 -8
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 255] Lint clenaup in hopfpci.c
K 12332
O -rw-rw-r--
P ntpd/refclock_hopfpci.c
------------------------------------------------
D184 5
D194 1
D209 1
D213 1
== ntpdc/ntpdc.c ==
stenn at whimsy.udel.edu|ntpdc/ntpdc.c|19990526004819|01635|3aed0663
stenn at whimsy.udel.edu|ntpdc/ntpdc.c|20031011075451|16292
D 1.32 03/11/29 19:14:57-05:00 stenn at whimsy.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 255] Lint cleanup in ntpdc.c
K 14997
O -rw-rw-r--
P ntpdc/ntpdc.c
------------------------------------------------
I504 1
\
D1386 1
D1407 1
I1407 1
} else if (getaddrinfo(hname, "ntp", &hints, &ai) == 0) {
== ntpq/ntpq.c ==
stenn at whimsy.udel.edu|ntpq/ntpq.c|19990526004819|01635|3aed0663
blu at corwin.|ntpq/ntpq.c|20031022151209|30796
D 1.45 03/11/29 19:16:56-05:00 stenn at whimsy.udel.edu +2 -3
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 255] Lint cleanup in ntpq.c
K 29491
O -rw-rw-r--
P ntpq/ntpq.c
------------------------------------------------
I686 1
\
D1671 1
D1690 1
D1693 1
I1693 1
} else if (getaddrinfo(hname, "ntp", &hints, &ai) == 0) {
# Patch checksum=eb8e4cac
More information about the bk-ntp-stable-send
mailing list