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

sourcestats: remove warning messages from SST_LoadFromFile()

Browse source 
There is a generic error message in SRC_ReloadSources().
This commit is contained in:
Miroslav Lichvar 2016-08-19 17:53:08 +02:00
parent b1accfd0ff
commit c30816eb65
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sourcestats.c
View file

@ -858,7 +858,7 @@ SST_LoadFromFile(SST_Stats inst, FILE *in)
unsigned long sec; unsigned long sec;
#endif #endif
unsigned long usec; unsigned long usec;
int i, line_number; int i;
char line[1024]; char line[1024];
double weight; double weight;
@ -868,8 +868,6 @@ SST_LoadFromFile(SST_Stats inst, FILE *in)
sscanf(line, "%d", &inst->n_samples) == 1 && sscanf(line, "%d", &inst->n_samples) == 1 &&
inst->n_samples > 0 && inst->n_samples <= MAX_SAMPLES) { inst->n_samples > 0 && inst->n_samples <= MAX_SAMPLES) {
line_number = 2;
for (i=0; i<inst->n_samples; i++) { for (i=0; i<inst->n_samples; i++) {
if (!fgets(line, sizeof(line), in) || if (!fgets(line, sizeof(line), in) ||
(sscanf(line, (sscanf(line,
@ -890,7 +888,6 @@ SST_LoadFromFile(SST_Stats inst, FILE *in)
/* This is the branch taken if the read FAILED */ /* This is the branch taken if the read FAILED */
LOG(LOGS_WARN, LOGF_SourceStats, "Failed to read data from line %d of dump file", line_number);
inst->n_samples = 0; /* Load abandoned if any sign of corruption */ inst->n_samples = 0; /* Load abandoned if any sign of corruption */
return 0; return 0;
} else { } else {
@ -899,12 +896,9 @@ SST_LoadFromFile(SST_Stats inst, FILE *in)
inst->sample_times[i].tv_sec = sec; inst->sample_times[i].tv_sec = sec;
inst->sample_times[i].tv_nsec = 1000 * usec; inst->sample_times[i].tv_nsec = 1000 * usec;
UTI_NormaliseTimespec(&inst->sample_times[i]); UTI_NormaliseTimespec(&inst->sample_times[i]);
line_number++;
} }
} }
} else { } else {
LOG(LOGS_WARN, LOGF_SourceStats, "Could not read number of samples from dump file");
inst->n_samples = 0; /* Load abandoned if any sign of corruption */ inst->n_samples = 0; /* Load abandoned if any sign of corruption */
return 0; return 0;
} }