faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use fscanf to read drift file

Browse source
This commit is contained in:
Miroslav Lichvar 2013-06-14 16:37:18 +02:00
parent f7e2d7c2ec
commit 4ef1c6f2c8
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reference.c
View file

@ -152,7 +152,6 @@ void
REF_Initialise(void) REF_Initialise(void)
{ {
FILE *in; FILE *in;
char line[1024];
double file_freq_ppm, file_skew_ppm; double file_freq_ppm, file_skew_ppm;
double our_frequency_ppm; double our_frequency_ppm;
@ -172,19 +171,15 @@ REF_Initialise(void)
if (drift_file) { if (drift_file) {
in = fopen(drift_file, "r"); in = fopen(drift_file, "r");
if (in) { if (in) {
if (fgets(line, sizeof(line), in)) { if (fscanf(in, "%lf%lf", &file_freq_ppm, &file_skew_ppm) == 2) {
if (sscanf(line, "%lf%lf", &file_freq_ppm, &file_skew_ppm) == 2) {
/* We have read valid data */ /* We have read valid data */
our_frequency_ppm = file_freq_ppm; our_frequency_ppm = file_freq_ppm;
our_skew = 1.0e-6 * file_skew_ppm; our_skew = 1.0e-6 * file_skew_ppm;
if (our_skew < MIN_SKEW) if (our_skew < MIN_SKEW)
our_skew = MIN_SKEW; our_skew = MIN_SKEW;
LOG(LOGS_INFO, LOGF_Reference, "Frequency %.3f +/- %.3f ppm read from %s", file_freq_ppm, file_skew_ppm, drift_file); LOG(LOGS_INFO, LOGF_Reference, "Frequency %.3f +/- %.3f ppm read from %s",
file_freq_ppm, file_skew_ppm, drift_file);
LCL_SetAbsoluteFrequency(our_frequency_ppm); LCL_SetAbsoluteFrequency(our_frequency_ppm);
} else {
LOG(LOGS_WARN, LOGF_Reference, "Could not parse valid frequency and skew from driftfile %s",
drift_file);
}
} else { } else {
LOG(LOGS_WARN, LOGF_Reference, "Could not read valid frequency and skew from driftfile %s", LOG(LOGS_WARN, LOGF_Reference, "Could not read valid frequency and skew from driftfile %s",
drift_file); drift_file);