diff options
| author | roberto <roberto@FreeBSD.org> | 2008-08-22 15:58:00 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2008-08-22 15:58:00 +0000 |
| commit | b85c7169a740b2edf0106ad59fdaa1b0160f823c (patch) | |
| tree | 2b9fb7f64eacb322e95695e412c923e97ba33e88 /contrib/ntp/clockstuff/propdelay.c | |
| parent | 1d197cfe9feac6bc29537d8e53c30b6435937b95 (diff) | |
| parent | 7a6072eb585696f8856cd498c3fd194cf49f14c6 (diff) | |
| download | FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.zip FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.tar.gz | |
Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit
will update usr.sbin/ntp to match this.
MFC after: 2 weeks
Diffstat (limited to 'contrib/ntp/clockstuff/propdelay.c')
| -rw-r--r-- | contrib/ntp/clockstuff/propdelay.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ntp/clockstuff/propdelay.c b/contrib/ntp/clockstuff/propdelay.c index 3ce571c..c8df686 100644 --- a/contrib/ntp/clockstuff/propdelay.c +++ b/contrib/ntp/clockstuff/propdelay.c @@ -115,7 +115,7 @@ int Gflag = 0; int height; char *progname; -int debug; +volatile int debug; static void doit (double, double, double, double, double, char *); static double latlong (char *, int); @@ -298,7 +298,7 @@ latlong( register char *cp; register char *bp; double arg; - double div; + double divby; int isneg; char buf[32]; char *colon; @@ -340,7 +340,7 @@ latlong( *bp = '\0'; cp++; arg = atof(buf); - div = 60.0; + divby = 60.0; colon = strchr(cp, ':'); if (colon != NULL) { bp = buf; @@ -348,11 +348,11 @@ latlong( *bp++ = *cp++; *bp = '\0'; cp++; - arg += atof(buf) / div; - div = 3600.0; + arg += atof(buf) / divby; + divby = 3600.0; } if (*cp != '\0') - arg += atof(cp) / div; + arg += atof(cp) / divby; } else { arg = atof(str); } |
