[Git][NTPsec/ntpsec][dgb-trace] Fixing borked merge
Ian Bruene
gitlab at mg.gitlab.com
Fri Jun 2 23:18:34 UTC 2017
Ian Bruene pushed to branch dgb-trace at NTPsec / ntpsec
Commits:
e874a780 by Ian Bruene at 2017-06-02T18:16:51-05:00
Fixing borked merge
Fixed missing includes
Typo
Typo (again)
Borked merge fix
Fixed refclock_generic.c, hopefully
Fixed typo
Had bunch of typos, fixed them across multiple commits, now squashing.
- - - - -
5 changed files:
- ntpd/ntp_io.c
- ntpd/ntp_scanner.c
- ntpd/refclock_generic.c
- ntpd/refclock_jjy.c
- ntpd/refclock_spectracom.c
Changes:
=====================================
ntpd/ntp_io.c
=====================================
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -297,7 +297,7 @@ maintain_activefds(
maxactivefd = i;
break;
}
- NTP_INSIST(fd != maxactivefd);
+ INSIST(fd != maxactivefd);
}
}
}
@@ -484,7 +484,7 @@ print_interface(const endpt *iface, const char *pfx, const char *sfx)
? "Disabled"
: "Enabled",
sfx);
- if (debug > 4) /* in-depth debugging only */ /* SPECIAL DEBUG */
+ if (debug > 4) /* in-depth debugging only */
interface_dump(iface);
}
#endif
@@ -593,8 +593,8 @@ is_ip_address(
char tmpbuf[128];
char *pch;
- NTP_REQUIRE(host != NULL);
- NTP_REQUIRE(addr != NULL);
+ REQUIRE(host != NULL);
+ REQUIRE(addr != NULL);
ZERO_SOCK(addr);
@@ -912,15 +912,15 @@ add_nic_rule(
rule->action = action;
if (MATCH_IFNAME == match_type) {
- NTP_REQUIRE(NULL != if_name);
+ REQUIRE(NULL != if_name);
rule->if_name = estrdup(if_name);
} else if (MATCH_IFADDR == match_type) {
- NTP_REQUIRE(NULL != if_name);
+ REQUIRE(NULL != if_name);
/* set rule->addr */
is_ip = is_ip_address(if_name, AF_UNSPEC, &rule->addr);
- NTP_REQUIRE(is_ip);
+ REQUIRE(is_ip);
} else
- NTP_REQUIRE(NULL == if_name);
+ REQUIRE(NULL == if_name);
LINK_SLIST(nic_rule_list, rule, next);
}
@@ -940,7 +940,7 @@ action_text(
t = "ERROR"; /* quiet uninit warning */
DPRINT(1, ("fatal: unknown nic_rule_action %u\n",
action));
- NTP_ENSURE(0);
+ ENSURE(0);
break;
case ACTION_LISTEN:
@@ -2359,7 +2359,7 @@ io_handler(void)
msyslog(LOG_ERR, "select() error: %m");
}
# ifdef DEBUG
- else if (debug > 4) { /* SPECIAL DEBUG */
+ else if (debug > 4) {
msyslog(LOG_DEBUG, "select(): nfound=%d, error: %m", nfound);
} else {
DPRINT(1, ("select() returned %d: %m\n", nfound));
@@ -2496,7 +2496,7 @@ input_handler(
*/
if (select_count == 0) { /* We really had nothing to do */
#ifdef DEBUG
- if (debug) /* SPECIAL DEBUG */
+ if (debug)
msyslog(LOG_DEBUG, "input_handler: select() returned 0");
#endif /* DEBUG */
return;
@@ -2510,7 +2510,7 @@ input_handler(
*/
ts_e -= ts;
collect_timing(NULL, "input handler", 1, ts_e);
- if (debug > 3) /* SPECIAL DEBUG */
+ if (debug > 3)
msyslog(LOG_DEBUG,
"input_handler: Processed a gob of fd's in %s msec",
lfptoms(ts_e, 6));
@@ -2761,7 +2761,7 @@ calc_addr_distance(
bool a1_greater;
int i;
- NTP_REQUIRE(AF(a1) == AF(a2));
+ REQUIRE(AF(a1) == AF(a2));
ZERO_SOCK(dist);
AF(dist) = AF(a1);
@@ -2812,7 +2812,7 @@ cmp_addr_distance(
{
int i;
- NTP_REQUIRE(AF(d1) == AF(d2));
+ REQUIRE(AF(d1) == AF(d2));
if (IS_IPV4(d1)) {
if (SRCADR(d1) < SRCADR(d2))
=====================================
ntpd/ntp_scanner.c
=====================================
--- a/ntpd/ntp_scanner.c
+++ b/ntpd/ntp_scanner.c
@@ -27,6 +27,7 @@
#include "ntpd.h"
#include "ntp_config.h"
#include "ntp_scanner.h"
+#include "ntp_debug.h"
#include "ntp_parser.tab.h"
#include "timespecops.h" /* for D_ISZERO_NS() */
=====================================
ntpd/refclock_generic.c
=====================================
--- a/ntpd/refclock_generic.c
+++ b/ntpd/refclock_generic.c
@@ -3481,6 +3481,7 @@ parse_process(
prettydate(reftime),
prettydate(rectime),
lfptoa(off,6)));
+ }
if (PARSE_PPS(parsetime->parse_state) && CLK_PPS(parse->peer))
{
=====================================
ntpd/refclock_jjy.c
=====================================
--- a/ntpd/refclock_jjy.c
+++ b/ntpd/refclock_jjy.c
@@ -107,6 +107,7 @@
#include "ntp_refclock.h"
#include "ntp_calendar.h"
#include "ntp_stdlib.h"
+#include "ntp_debug.h"
/**********************************************************************/
@@ -2037,7 +2038,7 @@ jjy_receive_tristate_gpsclock01 ( struct recvbuf *rbufp )
if ( iLen > 5
&& ( strncmp( pBuf, "$GP", 3 ) == 0 || strncmp( pBuf, "$PFEC", 5 ) == 0 ) ) {
DPRINT(1, ( "%s (refclock_jjy.c) : Skip NMEA stream [%s]\n",
- sFunctionName, pBuf )( ;
+ sFunctionName, pBuf )) ;
return JJY_RECEIVE_WAIT ;
}
@@ -4389,7 +4390,7 @@ modem_esc_silent ( struct peer *peer, struct refclockproc *pp, struct jjyunit *u
up->iModemSilentCount ++ ;
if ( up->iModemSilentCount < iModemStateTimeout[up->iModemState] / iModemSilentTimeout[up->iModemState] ) {
- DPRINT(1, printf( "refclock_jjy.c : modem_esc_silent : call modem_esc_escape\n" )) ;
+ DPRINT(1, ( "refclock_jjy.c : modem_esc_silent : call modem_esc_escape\n" )) ;
modem_esc_escape( peer, pp, up ) ;
up->iModemSilentTimer = 0 ;
return STAY_MODEM_STATE ;
=====================================
ntpd/refclock_spectracom.c
=====================================
--- a/ntpd/refclock_spectracom.c
+++ b/ntpd/refclock_spectracom.c
@@ -536,7 +536,7 @@ spectracom_poll(
refclock_receive(peer);
record_clock_stats(peer, pp->a_lastcode);
DPRINT(1, ("wwvb: timecode %d %s\n", pp->lencode,
- pp->a_lastcode);
+ pp->a_lastcode));
}
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/e874a780e8113f0ac11d94f943ac0acc9bcb8c73
---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/e874a780e8113f0ac11d94f943ac0acc9bcb8c73
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170602/4f8416f3/attachment.html>
More information about the vc
mailing list