From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 3 Nov 1999 03:32:01 +0000 (-0000)
Subject: ChangeLog, refclock_parse.c:
X-Git-Tag: NTP_4_0_98_D~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cbecda27c5565107aba83d35b393f89c47cb8ec;p=thirdparty%2Fntp.git

ChangeLog, refclock_parse.c:
  * ntpd/refclock_parse.c: Cleanup/fixes
  From: John Hay <jhay@mikom.csir.co.za>

bk: 381facb1W2CsYWh1f2kbJl54XY-8ZA
---

diff --git a/ChangeLog b/ChangeLog
index 6f05579a98..e768b7313b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-11-02  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* ntpd/refclock_parse.c: Cleanup/fixes
+	From: John Hay <jhay@mikom.csir.co.za>
+
 	* ntpd/refclock_parse.c: Lose #include "ntp_select.h"
 	* ntpd/ntpd.c: Lose #include "ntp_select.h"
 	* ntpd/ntp_io.c: Lose #include "ntp_select.h"
diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 7537aac654..23a6bbcccb 100644
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -1269,10 +1269,10 @@ static char * l_mktime    P((u_long));
 static void
 clear_err(
 	struct parseunit *parse,
-	u_long            state
+	u_long            lstate
 	)
 {
-	if (state == ERR_ALL)
+	if (lstate == ERR_ALL)
 	{
 		int i;
 
@@ -1287,22 +1287,22 @@ clear_err(
 	}
 	else
 	{
-		parse->errors[state].err_stage   = err_tbl[state];
-		parse->errors[state].err_cnt     = 0;
-		parse->errors[state].err_last    = 0;
-		parse->errors[state].err_started = 0;
-		parse->errors[state].err_suppressed = 0;
+		parse->errors[lstate].err_stage   = err_tbl[lstate];
+		parse->errors[lstate].err_cnt     = 0;
+		parse->errors[lstate].err_last    = 0;
+		parse->errors[lstate].err_started = 0;
+		parse->errors[lstate].err_suppressed = 0;
 	}
 }
 
 static int
 list_err(
 	struct parseunit *parse,
-	u_long            state
+	u_long            lstate
 	)
 {
 	int do_it;
-	struct errorinfo *err = &parse->errors[state];
+	struct errorinfo *err = &parse->errors[lstate];
 
 	if (err->err_started == 0)
 	{
@@ -2122,7 +2122,7 @@ init_iobinding(
  */
 static char *
 parsestate(
-	u_long state,
+	u_long lstate,
 	char *buffer
 	)
 {
@@ -2166,7 +2166,7 @@ parsestate(
 	i = 0;
 	while (flagstrings[i].bit)
 	{
-		if (flagstrings[i].bit & state)
+		if (flagstrings[i].bit & lstate)
 		{
 			if (buffer[0])
 			    strcat(buffer, "; ");
@@ -2175,7 +2175,7 @@ parsestate(
 		i++;
 	}
 
-	if (state & (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
+	if (lstate & (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
 	{
       char *s, *t;
 
@@ -2189,7 +2189,7 @@ parsestate(
 		i = 0;
 		while (sflagstrings[i].bit)
 		{
-			if (sflagstrings[i].bit & state)
+			if (sflagstrings[i].bit & lstate)
 			{
 				if (t != s)
 				{
@@ -2212,7 +2212,7 @@ parsestate(
  */
 static char *
 parsestatus(
-	u_long state,
+	u_long lstate,
 	char *buffer
 	)
 {
@@ -2238,7 +2238,7 @@ parsestatus(
 	i = 0;
 	while (flagstrings[i].bit)
 	{
-		if (flagstrings[i].bit & state)
+		if (flagstrings[i].bit & lstate)
 		{
 			if (buffer[0])
 			    strcat(buffer, "; ");
@@ -2255,7 +2255,7 @@ parsestatus(
  */
 static const char *
 clockstatus(
-	u_long state
+	u_long lstate
 	)
 {
 	static char buffer[20];
@@ -2279,14 +2279,14 @@ clockstatus(
 	i = 0;
 	while (flagstrings[i].value != ~0)
 	{
-		if (flagstrings[i].value == state)
+		if (flagstrings[i].value == lstate)
 		{
 			return flagstrings[i].name;
 		}
 		i++;
 	}
 
-	sprintf(buffer, "unknown #%ld", (u_long)state);
+	sprintf(buffer, "unknown #%ld", (u_long)lstate);
 
 	return buffer;
 }
@@ -2549,9 +2549,6 @@ parse_start(
 	
 	parse->generic->io.fd = fd232;
 	
-	parse->generic->nstages = parse->parse_type->cl_samples;
-	parse->generic->nskeep  = parse->parse_type->cl_keep;
-	
 	parse->peer = peer;		/* marks it also as busy */
 
 	/*