From: Martin Burnicki Date: Tue, 19 Jun 2018 09:40:42 +0000 (+0200) Subject: Removed trailing spaces in some files. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8068c8e1d823ef623d66401e1bc73391d88313b6;p=thirdparty%2Fntp.git Removed trailing spaces in some files. bk: 5b28cf9af55-nW92bTQDw5hfuGCd5w --- diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index 003b1534a..467c0e765 100644 --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -382,14 +382,14 @@ static void fatal_error(const char *fmt, ...) #endif { va_list va; - + va_start(va, fmt); mvsyslog(LOG_EMERG, fmt, va); va_end(va); _exit(1); } - + /* FUNCTIONS FOR INITIALIZATION * ---------------------------- */ @@ -742,7 +742,7 @@ dump_config_tree( atrv->value.i); } break; - + case T_Double: fprintf(df, " %s %s", keyword(atrv->attr), @@ -938,7 +938,7 @@ dump_config_tree( if (T_Source == flag_tok_fifo->i) { s = "source"; break; - } + } } } else { const char *ap = rest_node->addr->address; @@ -1446,7 +1446,7 @@ create_unpeer_node( /* accumulate with overflow retention */ u = (10 * u + *pch - '0') | (u & 0xFF000000u); } - + if (!*pch && u <= ASSOCID_MAX) { my_node->assocID = (associd_t)u; my_node->addr = NULL; @@ -2132,7 +2132,7 @@ config_tos( * since three variables with interdependecies are involved. We * just log an error but do not stop: This might be caused by * remote config, and it might be fixed by remote config, too. - */ + */ int l_maxclock = sys_maxclock; int l_minclock = sys_minclock; int l_minsane = sys_minsane; @@ -2162,7 +2162,7 @@ config_tos( tos->value.d = 0; } break; - + case T_Ceiling: val = tos->value.d; if (val > STRATUM_UNSPEC - 1) { @@ -2207,7 +2207,7 @@ config_tos( " - daemon will not operate properly!", l_minsane, l_minclock, l_maxclock); } - + /* -*- phase two: forward the values to the protocol machinery */ tos = HEAD_PFIFO(ptree->orphan_cmds); for (; tos != NULL; tos = tos->link) { @@ -4565,7 +4565,7 @@ config_ntpd( if (config_tos_clock(ptree)) clamp_systime(); } - + config_nic_rules(ptree, input_from_files); config_monitor(ptree); config_auth(ptree); diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c index d98f6aa50..f908d41fa 100644 --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c @@ -916,7 +916,7 @@ is_safe_filename(const char * name) u_int widx, bidx, mask; if ( ! (name && *name)) return FALSE; - + mask = 1u; while (0 != (widx = (u_char)*name++)) { bidx = (widx & 15) << 1; @@ -955,7 +955,7 @@ save_config( * level. On POSIX systems we could allow '\\' but such * filenames are tricky to manipulate from a shell, so just * reject both types of slashes on all platforms. - */ + */ /* TALOS-CAN-0062: block directory traversal for VMS, too */ static const char * illegal_in_filename = #if defined(VMS) @@ -983,8 +983,8 @@ save_config( # if defined(_O_TEXT) /* windows, again */ | _O_TEXT #endif - ; - + ; + char filespec[128]; char filename[128]; char fullpath[512]; @@ -1046,7 +1046,7 @@ save_config( /* copy data directly as we exactly know the size */ memcpy(filespec, reqpt, reqlen); filespec[reqlen] = '\0'; - + /* * allow timestamping of the saved config filename with * strftime() format such as: @@ -1154,7 +1154,7 @@ save_config( #else /* !SAVECONFIG follows */ ctl_printf("%s", "saveconfig unavailable, configured with --disable-saveconfig"); -#endif +#endif ctl_flushpkt(0); } @@ -1506,11 +1506,11 @@ ctl_putdata_ex( } else { datanotbinflag = TRUE; add_len = 3; - + if (datasent) { *datapt++ = ','; datalinelen++; - + /* sum up total length */ for (argi = 0, src_len = 0; argi < argc; ++argi) src_len += argv[argi].len; @@ -1539,14 +1539,14 @@ ctl_putdata_ex( /* Not enough room in this one, flush it out. */ if (src_len < cur_len) cur_len = src_len; - + memcpy(datapt, src_ptr, cur_len); datapt += cur_len; datalinelen += cur_len; src_ptr += cur_len; src_len -= cur_len; - + ctl_flushpkt(CTL_MORE); cur_len = (size_t)(dataend - datapt); } @@ -1571,7 +1571,7 @@ ctl_putdata( ) { CtlMemBufT args[1]; - + args[0].buf = dp; args[0].len = dlen; ctl_putdata_ex(args, 1, bin); @@ -1594,7 +1594,7 @@ ctl_putstr( ) { CtlMemBufT args[4]; - + args[0].buf = tag; args[0].len = strlen(tag); if (data && len) { @@ -1628,7 +1628,7 @@ ctl_putunqstr( ) { CtlMemBufT args[3]; - + args[0].buf = tag; args[0].len = strlen(tag); if (data && len) { @@ -1656,7 +1656,7 @@ ctl_putdblf( { char buffer[40]; int rc; - + rc = snprintf(buffer, sizeof(buffer), (use_f ? "%.*f" : "%.*g"), precision, d); @@ -1716,7 +1716,7 @@ ctl_putfs( { char buffer[16]; int rc; - + time_t fstamp = (time_t)uval - JAN_1970; struct tm *tm = gmtime(&fstamp); @@ -1744,7 +1744,7 @@ ctl_puthex( { char buffer[24]; /* must fit 64bit int! */ int rc; - + rc = snprintf(buffer, sizeof(buffer), "0x%lx", uval); INSIST(rc >= 0 && (size_t)rc < sizeof(buffer)); ctl_putunqstr(tag, buffer, rc); @@ -1762,7 +1762,7 @@ ctl_putint( { char buffer[24]; /*must fit 64bit int */ int rc; - + rc = snprintf(buffer, sizeof(buffer), "%ld", ival); INSIST(rc >= 0 && rc < sizeof(buffer)); ctl_putunqstr(tag, buffer, rc); @@ -1780,7 +1780,7 @@ ctl_putts( { char buffer[24]; int rc; - + rc = snprintf(buffer, sizeof(buffer), "0x%08lx.%08lx", (u_long)ts->l_ui, (u_long)ts->l_uf); @@ -1800,7 +1800,7 @@ ctl_putadr( ) { const char *cq; - + if (NULL == addr) cq = numtoa(addr32); else @@ -1874,7 +1874,7 @@ ctl_printf( va_list va; char fmtbuf[128]; int rc; - + va_start(va, fmt); rc = vsnprintf(fmtbuf, sizeof(fmtbuf), fmt, va); va_end(va); @@ -3061,7 +3061,7 @@ ctl_getitem( * packet; If it's EOV, it will never be NULL again until the * variable is found and processed in a given 'var_list'. (That * is, a result is returned that is neither NULL nor EOV). - */ + */ static const struct ctl_var eol = { 0, EOV, NULL }; static char buf[128]; static u_long quiet_until; @@ -3101,7 +3101,7 @@ ctl_getitem( ++plhead; while (plhead != pltail && isspace((u_char)pltail[-1])) --pltail; - + /* check payload size, terminate packet on overflow */ plsize = (size_t)(pltail - plhead); if (plsize >= sizeof(buf)) @@ -3126,7 +3126,7 @@ ctl_getitem( * variable lists after an EoV was returned. (Such a behavior * actually caused Bug 3008.) */ - + if (NULL == var_list) return &eol; @@ -3647,7 +3647,7 @@ static u_int32 derive_nonce( /* [Bug 3457] set flags and don't kill them again */ EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); EVP_DigestInit_ex(ctx, EVP_get_digestbynid(NID_md5), NULL); -# else +# else EVP_DigestInit(ctx, EVP_get_digestbynid(NID_md5)); # endif EVP_DigestUpdate(ctx, salt, sizeof(salt)); @@ -3944,7 +3944,7 @@ static void read_mru_list( int restrict_mask ) { - static const char nulltxt[1] = { '\0' }; + static const char nulltxt[1] = { '\0' }; static const char nonce_text[] = "nonce"; static const char frags_text[] = "frags"; static const char limit_text[] = "limit"; @@ -3954,7 +3954,7 @@ static void read_mru_list( static const char maxlstint_text[] = "maxlstint"; static const char laddr_text[] = "laddr"; static const char resaxx_fmt[] = "0x%hx"; - + u_int limit; u_short frags; u_short resall; diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c index 14cf22b5d..8d80767b9 100644 --- a/ntpdate/ntpdate.c +++ b/ntpdate/ntpdate.c @@ -429,7 +429,7 @@ ntpdatemain ( default: break; } - + if (errflg) { (void) fprintf(stderr, "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-t timeo] server ...\n", @@ -956,7 +956,7 @@ clock_filter( int ord[NTP_SHIFT]; INSIST((0 < sys_samples) && (sys_samples <= NTP_SHIFT)); - + /* * Sort indices into increasing delay order */ @@ -1062,7 +1062,7 @@ clock_select(void) } if (server->delay > NTP_MAXWGT) { if (debug) - printf("%s: Server dropped: server too far away\n", + printf("%s: Server dropped: server too far away\n", ntoa(&server->srcadr)); continue; /* too far away */ } @@ -1073,14 +1073,14 @@ clock_select(void) } if (!L_ISHIS(&server->org, &server->reftime)) { if (debug) - printf("%s: Server dropped: server is very broken\n", + printf("%s: Server dropped: server is very broken\n", ntoa(&server->srcadr)); continue; /* very broken host */ } if ((server->org.l_ui - server->reftime.l_ui) >= NTP_MAXAGE) { if (debug) - printf("%s: Server dropped: Server has gone too long without sync\n", + printf("%s: Server dropped: Server has gone too long without sync\n", ntoa(&server->srcadr)); continue; /* too long without sync */ } @@ -1440,7 +1440,7 @@ findserver( if (SRCPORT(addr) != NTP_PORT) return 0; - for (server = sys_servers; server != NULL; + for (server = sys_servers; server != NULL; server = server->next_server) { if (SOCK_EQ(addr, &server->srcadr)) return server; @@ -1451,7 +1451,7 @@ findserver( } } - if (mc_server != NULL) { + if (mc_server != NULL) { struct server *sp; @@ -1494,7 +1494,7 @@ timer(void) * who's event timers have expired. Give these to * the transmit routine. */ - for (server = sys_servers; server != NULL; + for (server = sys_servers; server != NULL; server = server->next_server) { if (server->event_time != 0 && server->event_time <= current_time) @@ -1520,7 +1520,7 @@ alarming( alarm_flag++; } #else /* SYS_WINNT follows */ -void CALLBACK +void CALLBACK alarming(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2) { UNUSED_ARG(uTimerID); UNUSED_ARG(uMsg); UNUSED_ARG(dwUser); @@ -2227,7 +2227,7 @@ isc_boolean_t ntp_port_inuse(int af, u_short port) * Check if NTP socket is already in use on this system * This is only for Windows Systems, as they tend not to fail on the real bind() below */ - + SOCKET checksocket; struct sockaddr_in checkservice; checksocket = socket(af, SOCK_DGRAM, 0);