diff options
Diffstat (limited to 'usr.sbin/xntpd/lib')
30 files changed, 63 insertions, 63 deletions
diff --git a/usr.sbin/xntpd/lib/a_md512crypt.c b/usr.sbin/xntpd/lib/a_md512crypt.c index e3705c0..515d83b 100644 --- a/usr.sbin/xntpd/lib/a_md512crypt.c +++ b/usr.sbin/xntpd/lib/a_md512crypt.c @@ -25,7 +25,7 @@ extern U_LONG authnokey; * a variable amount of encrypted data, multiple of 8 bytes, followed by: * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 16 @@ -80,7 +80,7 @@ MD5auth2crypt(keyno, pkt, length) MD5Final(&ctx); memmove((char *) &pkt[NOCRYPT_LONGS + length/sizeof(U_LONG)], - (char *) ctx.digest, + (char *) ctx.digest, BLOCK_OCTETS); return (4 + BLOCK_OCTETS); } diff --git a/usr.sbin/xntpd/lib/a_md5decrypt.c b/usr.sbin/xntpd/lib/a_md5decrypt.c index bde17c0..958c21f 100644 --- a/usr.sbin/xntpd/lib/a_md5decrypt.c +++ b/usr.sbin/xntpd/lib/a_md5decrypt.c @@ -25,7 +25,7 @@ extern U_LONG authnokey; * a variable amount of encrypted data, multiple of 8 bytes, followed by: * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 16 diff --git a/usr.sbin/xntpd/lib/a_md5encrypt.c b/usr.sbin/xntpd/lib/a_md5encrypt.c index 0d816dc..6fae6fb 100644 --- a/usr.sbin/xntpd/lib/a_md5encrypt.c +++ b/usr.sbin/xntpd/lib/a_md5encrypt.c @@ -25,7 +25,7 @@ extern U_LONG authnokey; * a variable amount of encrypted data, multiple of 8 bytes, followed by: * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 16 diff --git a/usr.sbin/xntpd/lib/atoint.c b/usr.sbin/xntpd/lib/atoint.c index 33b5c5d..57abd44 100644 --- a/usr.sbin/xntpd/lib/atoint.c +++ b/usr.sbin/xntpd/lib/atoint.c @@ -42,7 +42,7 @@ atoint(str, ival) if (isneg) *ival = -u; - else + else *ival = u; return 1; } diff --git a/usr.sbin/xntpd/lib/atolfp.c b/usr.sbin/xntpd/lib/atolfp.c index 649303e..644a38c 100644 --- a/usr.sbin/xntpd/lib/atolfp.c +++ b/usr.sbin/xntpd/lib/atolfp.c @@ -49,12 +49,12 @@ atolfp(str, lfp) */ while (isspace(*cp)) cp++; - + if (*cp == '-') { cp++; isneg = 1; } - + if (*cp == '+') cp++; @@ -70,7 +70,7 @@ atolfp(str, lfp) if (*cp != '\0' && !isspace(*cp)) { if (*cp++ != '.') return 0; - + while (ndec < 9 && *cp != '\0' && (ind = strchr(digits, *cp)) != NULL) { ndec++; @@ -81,7 +81,7 @@ atolfp(str, lfp) while (isdigit(*cp)) cp++; - + if (*cp != '\0' && !isspace(*cp)) return 0; } @@ -110,7 +110,7 @@ atolfp(str, lfp) if (isneg) M_NEG(dec_i, dec_f); - + lfp->l_ui = dec_i; lfp->l_uf = dec_f; return 1; diff --git a/usr.sbin/xntpd/lib/auth12crypt.c b/usr.sbin/xntpd/lib/auth12crypt.c index 0e69dbe..7d69122 100644 --- a/usr.sbin/xntpd/lib/auth12crypt.c +++ b/usr.sbin/xntpd/lib/auth12crypt.c @@ -11,7 +11,7 @@ * an 8 byte chunk of data which is encrypted in pass 2 * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 8 diff --git a/usr.sbin/xntpd/lib/authdecrypt.c b/usr.sbin/xntpd/lib/authdecrypt.c index 7462941..6ad3aeb 100644 --- a/usr.sbin/xntpd/lib/authdecrypt.c +++ b/usr.sbin/xntpd/lib/authdecrypt.c @@ -9,7 +9,7 @@ * a variable amount of unencrypted data, multiple of 8 bytes, followed by: * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 8 @@ -42,7 +42,7 @@ DESauthdecrypt(keyno, pkt, length) U_LONG work[2]; authdecryptions++; - + if (keyno == 0) keys = DESzerodkeys; else { diff --git a/usr.sbin/xntpd/lib/authencrypt.c b/usr.sbin/xntpd/lib/authencrypt.c index eb203e4..f84d10f 100644 --- a/usr.sbin/xntpd/lib/authencrypt.c +++ b/usr.sbin/xntpd/lib/authencrypt.c @@ -9,7 +9,7 @@ * a variable amount of encrypted data, multiple of 8 bytes, followed by: * NOCRYPT_OCTETS worth of unencrypted data, followed by: * BLOCK_OCTETS worth of ciphered checksum. - */ + */ #define NOCRYPT_OCTETS 4 #define BLOCK_OCTETS 8 diff --git a/usr.sbin/xntpd/lib/authkeys.c b/usr.sbin/xntpd/lib/authkeys.c index 8e590ce..9fce020 100644 --- a/usr.sbin/xntpd/lib/authkeys.c +++ b/usr.sbin/xntpd/lib/authkeys.c @@ -200,7 +200,7 @@ authhavekey(keyno) authkeynotfound++; return 0; } - + cache_keyid = sk->keyid; cache_flags = sk->flags; #ifdef MD5 @@ -233,7 +233,7 @@ auth_moremem() sk = (struct savekey *)malloc(MEMINC * sizeof(struct savekey)); if (sk == 0) return 0; - + for (i = MEMINC; i > 0; i--) { sk->next = authfreekeys; authfreekeys = sk++; @@ -262,7 +262,7 @@ authtrust(keyno, trust) if (sk == 0 && !trust) return; - + if (sk != 0) { if (cache_keyid == keyno) cache_flags = cache_keyid = 0; @@ -405,7 +405,7 @@ MD5auth_setkey(keyno, key) while (sk != 0) { if (keyno == sk->keyid) { strncpy(sk->k.MD5_key, (char *)key, sizeof(sk->k.MD5_key)); - if ((sk->keylen = strlen((char *)key)) > + if ((sk->keylen = strlen((char *)key)) > sizeof(sk->k.MD5_key)) sk->keylen = sizeof(sk->k.MD5_key); @@ -441,7 +441,7 @@ MD5auth_setkey(keyno, key) return; } #endif - + /* * auth_delkeys - delete all known keys, in preparation for rereading * the keys file (presumably) diff --git a/usr.sbin/xntpd/lib/authreadkeys.c b/usr.sbin/xntpd/lib/authreadkeys.c index 8d2697f..ee13441 100644 --- a/usr.sbin/xntpd/lib/authreadkeys.c +++ b/usr.sbin/xntpd/lib/authreadkeys.c @@ -44,7 +44,7 @@ nexttok(str) */ while (*cp == ' ' || *cp == '\t') cp++; - + /* * Save this and space to end of token */ @@ -52,19 +52,19 @@ nexttok(str) while (*cp != '\0' && *cp != '\n' && *cp != ' ' && *cp != '\t' && *cp != '#') cp++; - + /* * If token length is zero return an error, else set end of * token to zero and return start. */ if (starttok == cp) return 0; - + if (*cp == ' ' || *cp == '\t') *cp++ = '\0'; else *cp = '\0'; - + *str = cp; return starttok; } @@ -107,7 +107,7 @@ extern int fclose P((FILE *stream)); token = nexttok(&line); if (token == 0) continue; - + /* * First is key number. See if it is okay. */ diff --git a/usr.sbin/xntpd/lib/authusekey.c b/usr.sbin/xntpd/lib/authusekey.c index 20d7f3c..05fc0d7 100644 --- a/usr.sbin/xntpd/lib/authusekey.c +++ b/usr.sbin/xntpd/lib/authusekey.c @@ -84,14 +84,14 @@ authusekey(keyno, keytype, str) if (!DESauth_parity(key)) { return 0; } - + /* * We can't find a good reason not to use this key. * So use it. */ DESauth_setkey(keyno, key); break; - + case KEY_TYPE_ASCII: /* * Make up key from ascii representation @@ -103,7 +103,7 @@ authusekey(keyno, keytype, str) | (U_LONG)keybytes[2] << 8 | (U_LONG)keybytes[3]; key[1] = (U_LONG)keybytes[4] << 24 | (U_LONG)keybytes[5] << 16 | (U_LONG)keybytes[6] << 8 | (U_LONG)keybytes[7]; - + /* * Set parity on key */ diff --git a/usr.sbin/xntpd/lib/caljulian.c b/usr.sbin/xntpd/lib/caljulian.c index 070fa0d..64efd1e 100644 --- a/usr.sbin/xntpd/lib/caljulian.c +++ b/usr.sbin/xntpd/lib/caljulian.c @@ -60,7 +60,7 @@ caljulian(ntptime, jt) nt -= SECSPERCYCLE; cyear++; } - + /* * Seconds, minutes and hours are too hard to do without * divides, so we don't. @@ -96,7 +96,7 @@ caljulian(ntptime, jt) for (i = 0; i < 11; i++) if (snt < calmonthtab[i+1]) break; - + if (i > 9) jt->month = i - 9; /* January or February */ else diff --git a/usr.sbin/xntpd/lib/calleapwhen.c b/usr.sbin/xntpd/lib/calleapwhen.c index 83613ef..d68bbe9 100644 --- a/usr.sbin/xntpd/lib/calleapwhen.c +++ b/usr.sbin/xntpd/lib/calleapwhen.c @@ -52,7 +52,7 @@ calleapwhen(ntpdate, leaplast, leapnext) for (i = 1; i < 9; i++) if (dateincycle < (u_long)calleaptab[i]) break; - + /* * i points at the next leap. Compute the last and the next. */ diff --git a/usr.sbin/xntpd/lib/calyearstart.c b/usr.sbin/xntpd/lib/calyearstart.c index 015ed93..e78c058 100644 --- a/usr.sbin/xntpd/lib/calyearstart.c +++ b/usr.sbin/xntpd/lib/calyearstart.c @@ -35,7 +35,7 @@ calyearstart(dateinyear) cyclestart = MAR1900; while ((cyclestart + SECSPERCYCLE) <= dateinyear) cyclestart += SECSPERCYCLE; - + /* * If we're in the first year of the cycle, January 1 is * two months back from the cyclestart and the year is diff --git a/usr.sbin/xntpd/lib/clocktypes.c b/usr.sbin/xntpd/lib/clocktypes.c index 38b8cd2..4c5f437 100644 --- a/usr.sbin/xntpd/lib/clocktypes.c +++ b/usr.sbin/xntpd/lib/clocktypes.c @@ -63,7 +63,7 @@ clockname(num) int num; { register struct clktype *clk; - + for (clk = clktypes; clk->code != -1; clk++) { if (num == clk->code) return (clk->abbrev); diff --git a/usr.sbin/xntpd/lib/decodenetnum.c b/usr.sbin/xntpd/lib/decodenetnum.c index 65e7761..f19b137 100644 --- a/usr.sbin/xntpd/lib/decodenetnum.c +++ b/usr.sbin/xntpd/lib/decodenetnum.c @@ -50,7 +50,7 @@ decodenetnum(num, netnum) *netnum <<= 8; *netnum += temp; } - + if (i < 4) return 0; *netnum = htonl(*netnum); diff --git a/usr.sbin/xntpd/lib/dofptoa.c b/usr.sbin/xntpd/lib/dofptoa.c index 31673fb..bfa9c71 100644 --- a/usr.sbin/xntpd/lib/dofptoa.c +++ b/usr.sbin/xntpd/lib/dofptoa.c @@ -72,7 +72,7 @@ dofptoa(fpv, neg, ndec, msec) if (dec > 6) dec = 6; - + if (dec > 0) { do { val &= 0xffff; @@ -99,14 +99,14 @@ dofptoa(fpv, neg, ndec, msec) */ while (cp < (cpdec -1) && *cp == 0) cp++; - + /* * Copy it into the buffer, asciizing as we go. */ bp = buf; if (neg) *bp++ = '-'; - + while (cp < cpend) { if (cp == cpdec) *bp++ = '.'; diff --git a/usr.sbin/xntpd/lib/dolfptoa.c b/usr.sbin/xntpd/lib/dolfptoa.c index a79d8c6..24fc213 100644 --- a/usr.sbin/xntpd/lib/dolfptoa.c +++ b/usr.sbin/xntpd/lib/dolfptoa.c @@ -81,7 +81,7 @@ dolfptoa(fpi, fpv, neg, ndec, msec) } if (dec > 12) dec = 12; - + /* * If there's a fraction to deal with, do so. */ diff --git a/usr.sbin/xntpd/lib/findconfig.c b/usr.sbin/xntpd/lib/findconfig.c index 8312668..a65f32c 100755 --- a/usr.sbin/xntpd/lib/findconfig.c +++ b/usr.sbin/xntpd/lib/findconfig.c @@ -11,8 +11,8 @@ FindConfig(base) { static char result[BUFSIZ]; char hostname[BUFSIZ], *cp; - struct stat sbuf; - struct utsname unamebuf; + struct stat sbuf; + struct utsname unamebuf; /* All keyed by initial target being a directory */ (void) strcpy(result, base); @@ -46,8 +46,8 @@ FindConfig(base) } } } - } - } + } + } } outahere: return(result); diff --git a/usr.sbin/xntpd/lib/getopt.c b/usr.sbin/xntpd/lib/getopt.c index 8505d80..b5164c60 100644 --- a/usr.sbin/xntpd/lib/getopt.c +++ b/usr.sbin/xntpd/lib/getopt.c @@ -63,7 +63,7 @@ ntp_getopt(argc, argv, optstring) scan = NULL; ntp_optind++; } - + if (scan == NULL || *scan == '\0') { if (ntp_optind >= argc || argv[ntp_optind][0] != '-' @@ -75,7 +75,7 @@ ntp_getopt(argc, argv, optstring) ntp_optind++; return (EOF); } - + scan = argv[ntp_optind++]+1; } diff --git a/usr.sbin/xntpd/lib/hextolfp.c b/usr.sbin/xntpd/lib/hextolfp.c index d9291cc..104446c 100644 --- a/usr.sbin/xntpd/lib/hextolfp.c +++ b/usr.sbin/xntpd/lib/hextolfp.c @@ -30,7 +30,7 @@ hextolfp(str, lfp) */ while (isspace(*cp)) cp++; - + cpstart = cp; while (*cp != '\0' && (cp - cpstart) < 8 && (ind = strchr(digits, *cp)) != NULL) { @@ -56,7 +56,7 @@ hextolfp(str, lfp) if ((cp - cpstart) < 8 || ind == NULL) return 0; - + if (*cp != '\0' && !isspace(*cp)) return 0; diff --git a/usr.sbin/xntpd/lib/humandate.c b/usr.sbin/xntpd/lib/humandate.c index 8ea936f..b7b89bc 100644 --- a/usr.sbin/xntpd/lib/humandate.c +++ b/usr.sbin/xntpd/lib/humandate.c @@ -29,14 +29,14 @@ humandate(ntptime) time_t sec; LIB_GETBUF(bp); - + sec = ntptime - JAN_1970; tm = localtime(&sec); (void) sprintf(bp, "%s, %s %2d %4d %2d:%02d:%02d", days[tm->tm_wday], months[tm->tm_mon], tm->tm_mday, 1900+tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec); - + return bp; } @@ -50,12 +50,12 @@ humanlogtime() char *bp; time_t cursec = time((time_t *) 0); struct tm *tm = localtime(&cursec); - + LIB_GETBUF(bp); - + (void) sprintf(bp, "%2d %s %02d:%02d:%02d", tm->tm_mday, months[tm->tm_mon], tm->tm_hour, tm->tm_min, tm->tm_sec); - + return bp; } diff --git a/usr.sbin/xntpd/lib/md5.c b/usr.sbin/xntpd/lib/md5.c index 2c373cf..a5aca7a 100644 --- a/usr.sbin/xntpd/lib/md5.c +++ b/usr.sbin/xntpd/lib/md5.c @@ -82,7 +82,7 @@ unsigned char PADDING[64] = { * inline assembly code, we can speed this up a bit. */ inline UINT4 ROTATE_LEFT(UINT4 x, int n) -{ +{ asm("roll %2,%0" : "=d" (x) : "0" (x), "Ir" (n)); return x; } diff --git a/usr.sbin/xntpd/lib/mstolfp.c b/usr.sbin/xntpd/lib/mstolfp.c index f9c21b7..e4c4d46 100644 --- a/usr.sbin/xntpd/lib/mstolfp.c +++ b/usr.sbin/xntpd/lib/mstolfp.c @@ -32,7 +32,7 @@ mstolfp(str, lfp) cp = str; while (isspace(*cp)) cp++; - + if (*cp == '-') { *bp++ = '-'; cp++; @@ -81,7 +81,7 @@ mstolfp(str, lfp) */ while (cp < cpdec) *bp++ = (char)*cp++; - + if (*cp == '.') { cp++; while (isdigit(*cp)) diff --git a/usr.sbin/xntpd/lib/netof.c b/usr.sbin/xntpd/lib/netof.c index def3013..1823fb2 100644 --- a/usr.sbin/xntpd/lib/netof.c +++ b/usr.sbin/xntpd/lib/netof.c @@ -1,4 +1,4 @@ -/* +/* * netof - return the net address part of an ip address * (zero out host part) */ diff --git a/usr.sbin/xntpd/lib/numtohost.c b/usr.sbin/xntpd/lib/numtohost.c index 844bbce..9d83584 100644 --- a/usr.sbin/xntpd/lib/numtohost.c +++ b/usr.sbin/xntpd/lib/numtohost.c @@ -29,9 +29,9 @@ numtohost(netnum) || ((hp = gethostbyaddr((char *)&netnum, sizeof netnum, AF_INET)) == 0)) return numtoa(netnum); - + LIB_GETBUF(bp); - + bp[LIB_BUFLENGTH-1] = '\0'; (void) strncpy(bp, hp->h_name, LIB_BUFLENGTH-1); return bp; diff --git a/usr.sbin/xntpd/lib/prettydate.c b/usr.sbin/xntpd/lib/prettydate.c index 747e310..fd4a8b1 100644 --- a/usr.sbin/xntpd/lib/prettydate.c +++ b/usr.sbin/xntpd/lib/prettydate.c @@ -29,7 +29,7 @@ prettydate(ts) }; LIB_GETBUF(bp); - + sec = ts->l_ui - JAN_1970; msec = ts->l_uf / 4294967; /* fract / (2 ** 32 / 1000) */ @@ -39,6 +39,6 @@ prettydate(ts) (u_long)ts->l_ui, (u_long)ts->l_uf, days[tm->tm_wday], months[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year, tm->tm_hour,tm->tm_min, tm->tm_sec, msec); - + return bp; } diff --git a/usr.sbin/xntpd/lib/refnumtoa.c b/usr.sbin/xntpd/lib/refnumtoa.c index b46fdd8..8bb7d38 100644 --- a/usr.sbin/xntpd/lib/refnumtoa.c +++ b/usr.sbin/xntpd/lib/refnumtoa.c @@ -14,9 +14,9 @@ refnumtoa(num) register u_long netnum; register char *buf; register const char *rclock; - + netnum = ntohl(num); - + LIB_GETBUF(buf); rclock = clockname((int)((netnum >> 8) & 0xff)); diff --git a/usr.sbin/xntpd/lib/systime.c b/usr.sbin/xntpd/lib/systime.c index 4464e8d..53f0e67 100644 --- a/usr.sbin/xntpd/lib/systime.c +++ b/usr.sbin/xntpd/lib/systime.c @@ -100,7 +100,7 @@ int step_systime(ts) l_fp *ts; { -#ifdef SLEWALWAYS +#ifdef SLEWALWAYS #ifdef STEP_SLEW register u_long tmp_ui; register u_long tmp_uf; @@ -121,7 +121,7 @@ step_systime(ts) if (tmp_ui >= 3) { /* Step it and slew we might win */ n = step_systime_real(ts); if (!n) return n; - if (isneg) + if (isneg) ts->l_ui = ~0; else ts->l_ui = ~0; diff --git a/usr.sbin/xntpd/lib/utvtoa.c b/usr.sbin/xntpd/lib/utvtoa.c index 48310a8..5a192e1 100644 --- a/usr.sbin/xntpd/lib/utvtoa.c +++ b/usr.sbin/xntpd/lib/utvtoa.c @@ -14,7 +14,7 @@ utvtoa(tv) register char *buf; LIB_GETBUF(buf); - + (void) sprintf(buf, "%lu.%06lu", (u_long)tv->tv_sec, (u_long)tv->tv_usec); return buf; |