From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 23 Jan 2006 06:20:16 +0000 (-0500)
Subject: Cleanup from Ralf Wildenhues
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=318add70aebff5a34dfb160ff93dd39eab1f7257;p=thirdparty%2Fntp.git

Cleanup from Ralf Wildenhues

bk: 43d475a0MTTJIT4y-HzKgnVep4Bizg
---

diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h
index 3e15bc301a..c389d1ecc9 100644
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -100,7 +100,7 @@ extern	const char *	FindConfig	P((const char *));
 
 extern	void	signal_no_reset P((int, RETSIGTYPE (*func)(int)));
 
-extern	void	getauthkeys 	P((char *));
+extern	void	getauthkeys 	P((const char *));
 extern	void	auth_agekeys	P((void));
 extern	void	rereadkeys	P((void));
 
diff --git a/include/ntpd.h b/include/ntpd.h
index e91dd23722..695112c6e6 100644
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -59,7 +59,7 @@ struct ctl_var {
 extern  char *  add_var P((struct ctl_var **, u_long, u_short));
 extern  void    free_varlist P((struct ctl_var *));
 extern  void    set_var P((struct ctl_var **, const char *, u_long, u_short));
-extern  void    set_sys_var P((char *, u_long, u_short));
+extern  void    set_sys_var P((const char *, u_long, u_short));
 
 /* ntp_intres.c */
 extern	void	ntp_res_name	P((struct sockaddr_storage, u_short));
@@ -210,7 +210,7 @@ extern	l_fp	sys_revoketime;
 /* ntp_util.c */
 extern	void	init_util	P((void));
 extern	void	hourly_stats	P((void));
-extern	void	stats_config	P((int, char *));
+extern	void	stats_config	P((int, const char *));
 extern	void	record_peer_stats P((struct sockaddr_storage *, int, double, double, double, double));
 extern	void	record_loop_stats P((double, double, double, double, int));
 extern	void	record_clock_stats P((struct sockaddr_storage *, const char *));
diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index 231aea1ffa..9f7c790aca 100644
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -229,7 +229,7 @@ getaddrinfo (const char *nodename, const char *servname,
 		port = 0;
 
 	/*
-	/*
+	 *
 	 * Set up the port number
 	 */
 	if (ai->ai_family == AF_INET)
diff --git a/ntpd/cmd_args.c b/ntpd/cmd_args.c
index d0bbebea2f..0c30f32dda 100644
--- a/ntpd/cmd_args.c
+++ b/ntpd/cmd_args.c
@@ -184,7 +184,7 @@ getCmdOpts(
 	char *argv[]
 	)
 {
-	extern char *config_file;
+	extern const char *config_file;
 	int errflg;
 	tOptions myOptions =
 #ifdef SIM
@@ -254,12 +254,12 @@ getCmdOpts(
 	if (HAVE_OPT( PROPAGATIONDELAY ))
 		do {
 			double tmp;
-			char *ntp_optarg = OPT_ARG( PROPAGATIONDELAY );
+			const char *my_ntp_optarg = OPT_ARG( PROPAGATIONDELAY );
 
-			if (sscanf(ntp_optarg, "%lf", &tmp) != 1) {
+			if (sscanf(my_ntp_optarg, "%lf", &tmp) != 1) {
 				msyslog(LOG_ERR,
 					"command line broadcast delay value %s undecodable",
-					ntp_optarg);
+					my_ntp_optarg);
 			} else {
 				proto_config(PROTO_BROADDELAY, 0, tmp, NULL);
 			}
@@ -269,12 +269,12 @@ getCmdOpts(
 		stats_config(STATS_STATSDIR, OPT_ARG( STATSDIR ));
 
 	if (HAVE_OPT( TRUSTEDKEY )) {
-		int     ct = STACKCT_OPT(  TRUSTEDKEY );
-		char**  pp = STACKLST_OPT( TRUSTEDKEY );
+		int           ct = STACKCT_OPT(  TRUSTEDKEY );
+		const char**  pp = STACKLST_OPT( TRUSTEDKEY );
 
 		do  {
 			u_long tkey;
-			char* p = *pp++;
+			const char* p = *pp++;
 
 			tkey = (int)atol(p);
 			if (tkey <= 0 || tkey > NTP_MAXKEY) {
@@ -307,25 +307,25 @@ getCmdOpts(
 	}
 
 	if (HAVE_OPT( VAR )) {
-		int     ct = STACKCT_OPT(  VAR );
-		char**  pp = STACKLST_OPT( VAR );
+		int           ct = STACKCT_OPT(  VAR );
+		const char**  pp = STACKLST_OPT( VAR );
 
 		do  {
-			char* ntp_optarg = *pp++;
+			const char* my_ntp_optarg = *pp++;
 
-			set_sys_var(ntp_optarg, strlen(ntp_optarg)+1,
+			set_sys_var(my_ntp_optarg, strlen(my_ntp_optarg)+1,
 			    (u_short) (RW));
 		} while (--ct > 0);
 	}
 
 	if (HAVE_OPT( DVAR )) {
-		int     ct = STACKCT_OPT(  DVAR );
-		char**  pp = STACKLST_OPT( DVAR );
+		int           ct = STACKCT_OPT(  DVAR );
+		const char**  pp = STACKLST_OPT( DVAR );
 
 		do  {
-			char* ntp_optarg = *pp++;
+			const char* my_ntp_optarg = *pp++;
 
-			set_sys_var(ntp_optarg, strlen(ntp_optarg)+1,
+			set_sys_var(my_ntp_optarg, strlen(my_ntp_optarg)+1,
 			    (u_short) (RW | DEF));
 		} while (--ct > 0);
 	}
diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index e734f27109..47842ab18e 100644
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -60,7 +60,9 @@ static	void	ctl_putid	P((const char *, char *));
 static	void	ctl_putarray	P((const char *, double *, int));
 static	void	ctl_putsys	P((int));
 static	void	ctl_putpeer	P((int, struct peer *));
+#ifdef OPENSSL
 static	void	ctl_putfs	P((const char *, tstamp_t));
+#endif
 #ifdef REFCLOCK
 static	void	ctl_putclock	P((int, struct refclockstat *, int));
 #endif	/* REFCLOCK */
@@ -1004,6 +1006,7 @@ ctl_putuint(
 /*
  * ctl_putfs - write a decoded filestamp into the response
  */
+#ifdef OPENSSL
 static void
 ctl_putfs(
 	const char *tag,
@@ -1033,6 +1036,7 @@ ctl_putfs(
 		cp++;
 	ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
 }
+#endif
 
 
 /*
@@ -2965,7 +2969,7 @@ set_var(
 
 void
 set_sys_var(
-	char *data,
+	const char *data,
 	u_long size,
 	u_short def
 	)
diff --git a/ntpd/ntp_util.c b/ntpd/ntp_util.c
index c6fa465127..b43e83a4b6 100644
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -251,11 +251,11 @@ hourly_stats(void)
 void
 stats_config(
 	int item,
-	char *invalue	/* only one type so far */
+	const char *invalue	/* only one type so far */
 	)
 {
 	FILE *fp;
-	char *value;
+	const char *value;
 	int len;
 
 	/*
@@ -644,7 +644,7 @@ record_crypto_stats(
  */
 void
 getauthkeys(
-	char *keyfile
+	const char *keyfile
 	)
 {
 	int len;
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 62f51bb068..cda0bc85ae 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -222,7 +222,7 @@ static void	setup_logfile		P((void));
 void
 init_logging(char const *name)
 {
-	char *cp;
+	const char *cp;
 
 	/*
 	 * Logging.  This may actually work on the gizmo board.  Find a name
@@ -230,7 +230,7 @@ init_logging(char const *name)
 	 */
 	cp = strrchr(name, '/');
 	if (cp == 0)
-		cp = (char*)name;
+		cp = name;
 	else
 		cp++;
 
@@ -268,18 +268,18 @@ setup_logfile(
 	)
 {
 	if (HAVE_OPT( LOGFILE )) {
-		const char *optarg = OPT_ARG( LOGFILE );
+		const char *my_optarg = OPT_ARG( LOGFILE );
 		FILE *new_file;
 
-		if(strcmp(optarg, "stderr") == 0)
+		if(strcmp(my_optarg, "stderr") == 0)
 			new_file = stderr;
-		else if(strcmp(optarg, "stdout") == 0)
+		else if(strcmp(my_optarg, "stdout") == 0)
 			new_file = stdout;
 		else
-			new_file = fopen(optarg, "a");
+			new_file = fopen(my_optarg, "a");
 		if (new_file != NULL) {
 			NLOG(NLOG_SYSINFO)
-				msyslog(LOG_NOTICE, "logging to file %s", optarg);
+				msyslog(LOG_NOTICE, "logging to file %s", my_optarg);
 			if (syslog_file != NULL &&
 				fileno(syslog_file) != fileno(new_file))
 				(void)fclose(syslog_file);
@@ -290,7 +290,7 @@ setup_logfile(
 		else
 			msyslog(LOG_ERR,
 				"Cannot open log file %s",
-				optarg);
+				my_optarg);
 	}
 }
 
diff --git a/ntpd/refclock_acts.c b/ntpd/refclock_acts.c
index e8400f2ce2..9cc8bce7cf 100644
--- a/ntpd/refclock_acts.c
+++ b/ntpd/refclock_acts.c
@@ -368,7 +368,7 @@ acts_message(
 	up = (struct actsunit *)pp->unitptr;
 #ifdef DEBUG
 	ioctl(pp->io.fd, TIOCMGET, (char *)&modem);
-	sprintf(tbuf, "acts: %04x (%d %d) %d %s", modem, up->state,
+	sprintf(tbuf, "acts: %04x (%d %d) %lu %s", modem, up->state,
 	    up->timer, strlen(pp->a_lastcode), pp->a_lastcode);
 	if (debug)
 		printf("%s\n", tbuf);
diff --git a/ntpd/refclock_neoclock4x.c b/ntpd/refclock_neoclock4x.c
index 8bee2925b2..5efefd0601 100644
--- a/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@ -631,7 +631,7 @@ neoclock4x_receive(struct recvbuf *rbufp)
 #if defined(NTP_PRE_420)
               pp->msec
 #else
-              pp->nsec/1000
+              (int)(pp->nsec/1000)
 #endif
               );
     }
diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 7ad97776ae..987e9192be 100644
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -328,8 +328,8 @@ ntpdcmain(
 	}
 
 	if (HAVE_OPT(COMMAND)) {
-		int	cmdct = STACKCT_OPT( COMMAND );
-		char**	cmds  = STACKLST_OPT( COMMAND );
+		int		cmdct = STACKCT_OPT( COMMAND );
+		const char**	cmds  = STACKLST_OPT( COMMAND );
 
 		while (cmdct-- > 0) {
 			ADDCMD(*cmds++);
diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 40ce6b4655..16c1c6bd5e 100644
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -537,8 +537,8 @@ ntpqmain(
 	}
 
 	if (HAVE_OPT(COMMAND)) {
-		int	cmdct = STACKCT_OPT( COMMAND );
-		char**	cmds  = STACKLST_OPT( COMMAND );
+		int		cmdct = STACKCT_OPT( COMMAND );
+		const char**	cmds  = STACKLST_OPT( COMMAND );
 
 		while (cmdct-- > 0) {
 			ADDCMD(*cmds++);
diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index 4b4b3296fd..ed7b35328c 100644
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -242,10 +242,10 @@ main(
 	char	*grpkey = NULL;	/* identity extension */
 	int	nid;		/* X509 digest/signature scheme */
 	FILE	*fstr = NULL;	/* file handle */
+	u_int	temp;
 #define iffsw   HAVE_OPT(ID_KEY)
 #endif /* OPENSSL */
 	char	hostbuf[MAXHOSTNAME + 1];
-	u_int	temp;
 
 #ifdef SYS_WINNT
 	/* Initialize before OpenSSL checks */