From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 21 Apr 2001 06:34:51 +0000 (-0000)
Subject: Many files:
X-Git-Tag: NTP_4_0_99_M~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9bcc5ea35bd7cbfe9fad493cba7630c5a4877b6;p=thirdparty%2Fntp.git

Many files:
  * util/ntp-genkeys.c: config_file should be declared, not defined.
  * ntpd/refclock_mx4200.c (mx4200_pps): debug cleanup.
  * ntpd/refclock_hopfser.c: If we're not using it, provide the _bs.
  * ntpd/refclock_heath.c (heath_receive): Add missing "break"
  statements.
  * ntpd/ntp_proto.c: Lose extra definition of mode_ntpdate.
  * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Put RSASRCS
  on the same line as rsaref.h to improve portability.
  * libntp/msyslog.c: Lint cleanup.
  From: Marc.Brett@westerngeco.com

bk: 3ae12a0bdgQkMzGNbaFu_3XJaYoWeQ
---

diff --git a/ChangeLog b/ChangeLog
index 0b66e2cb55..c6cb53d4bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2001-04-21  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* util/ntp-genkeys.c: config_file should be declared, not defined.
+	* ntpd/refclock_mx4200.c (mx4200_pps): debug cleanup.
+	* ntpd/refclock_hopfser.c: If we're not using it, provide the _bs.
+	* ntpd/refclock_heath.c (heath_receive): Add missing "break"
+	statements.
+	* ntpd/ntp_proto.c: Lose extra definition of mode_ntpdate.
+	* librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Put RSASRCS
+	on the same line as rsaref.h to improve portability.
+	* libntp/msyslog.c: Lint cleanup.
+	From: Marc.Brett@westerngeco.com
+
 	* util/ntp-genkeys.c:
 	* ntpdate/ntpdate.c:
 	* ntpd/ntp_config.c: Netinfo header reorder.
diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index 68426cfe50..98648814ae 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -66,10 +66,6 @@ void msyslog(int level, const char *fmt, ...)
 	register int c;
 	register char *n, *prog;
 	register const char *f;
-#ifdef CHAR_SYS_ERRLIST
-	extern int sys_nerr;
-	extern char *sys_errlist[];
-#endif
 	int olderrno;
 	char *err;
 
diff --git a/librsaref/Makefile.am b/librsaref/Makefile.am
index 301fb2f245..889251ebcb 100644
--- a/librsaref/Makefile.am
+++ b/librsaref/Makefile.am
@@ -27,8 +27,7 @@ nodist_librsaref_a_SOURCES = \
 	prime.h \
 	r_random.h \
 	rsa.h \
-	rsaref.h \
-	@RSASRCS@
+	rsaref.h @RSASRCS@
 
 librsaref_a_LIBADD = @RSAOBJS@
 librsaref_a_DEPENDENCIES = $(librsaref_a_LIBADD)
diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in
index 0e4c40bf01..3faba0222a 100644
--- a/librsaref/Makefile.in
+++ b/librsaref/Makefile.in
@@ -145,8 +145,7 @@ nodist_librsaref_a_SOURCES = \
 	prime.h \
 	r_random.h \
 	rsa.h \
-	rsaref.h \
-	@RSASRCS@
+	rsaref.h @RSASRCS@
 
 
 librsaref_a_LIBADD = @RSAOBJS@
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 7a487d2e79..8ed65c9825 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -54,7 +54,6 @@ static	double sys_syserr;	/* system error (squares) */
 keyid_t	sys_private;		/* private value for session seed */
 int	sys_manycastserver;	/* respond to manycast client pkts */
 u_int sys_survivors;		/* truest of the truechimers */
-int	mode_ntpdate;		/* simulate ntpdate */
 int	peer_ntpdate;		/* active peers in ntpdate mode */
 #ifdef AUTOKEY
 char	*sys_hostname;		/* gethostname() name */
diff --git a/ntpd/refclock_heath.c b/ntpd/refclock_heath.c
index 38e9f63a55..ef4db5a4d4 100644
--- a/ntpd/refclock_heath.c
+++ b/ntpd/refclock_heath.c
@@ -339,6 +339,7 @@ heath_receive(
 			refclock_report(peer, CEVNT_BADREPLY);
 			return;
 		}
+		break;
 
 	/*
 	 * GC-1000 II timecode format: "hh:mm:ss.f   "
@@ -349,6 +350,7 @@ heath_receive(
 			refclock_report(peer, CEVNT_BADREPLY);
 			return;
 		}
+		break;
 
 	default:
 		refclock_report(peer, CEVNT_BADREPLY);
diff --git a/ntpd/refclock_hopfser.c b/ntpd/refclock_hopfser.c
index f09631a281..a9d74dda1d 100644
--- a/ntpd/refclock_hopfser.c
+++ b/ntpd/refclock_hopfser.c
@@ -367,4 +367,6 @@ hopfserial_poll (
 	return;
 }
 
+#else
+int refclock_hopfser_bs;
 #endif /* REFCLOCK */
diff --git a/ntpd/refclock_mx4200.c b/ntpd/refclock_mx4200.c
index e0e7618669..3c520b0b19 100644
--- a/ntpd/refclock_mx4200.c
+++ b/ntpd/refclock_mx4200.c
@@ -1524,8 +1524,8 @@ mx4200_pps(
 	if (time_pps_fetch(up->pps_h, PPS_TSFMT_TSPEC, &(up->pps_i),
 			&timeout) < 0) {
 		mx4200_debug(peer,
-		  "mx4200_pps: time_pps_fetch: serial=%d, handle=%d, %s\n",
-		     up->pps_i.assert_sequence, up->pps_h, strerror(errno));
+		  "mx4200_pps: time_pps_fetch: serial=%d, %s\n",
+		     up->pps_i.assert_sequence, strerror(errno));
 		refclock_report(peer, CEVNT_FAULT);
 		return(1);
 	}
diff --git a/util/ntp-genkeys.c b/util/ntp-genkeys.c
index 03e8bde75d..e896b5e363 100644
--- a/util/ntp-genkeys.c
+++ b/util/ntp-genkeys.c
@@ -117,7 +117,7 @@
  */
 
 
-char *config_file;
+extern char *config_file;
 
 #ifdef HAVE_NETINFO
 struct netinfo_config_state *config_netinfo = NULL;
@@ -736,7 +736,7 @@ main(
 #endif /* PUBKEY */
 	struct timeval tv;		/* initialization vector */
 	u_long ntptime;			/* NTP timestamp */
-	u_char hostname[256];		/* DNS host name */
+	char hostname[256];		/* DNS host name */
 	u_char md5key[17];		/* generated MD5 key */ 
 	FILE *str;			/* file handle */
 	u_int temp;