rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix ovnisync table parsing

Browse Source
This commit is contained in:
Rodrigo Arias 2021-09-28 12:22:56 +02:00
parent 3a0541e5fa
commit b9568cb052
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emu.c
View File

@ -467,8 +467,8 @@ load_clock_offsets(struct ovni_emu *emu)
{ {
FILE *f; FILE *f;
char buf[1024]; char buf[1024];
int i, rank; int i, rank, ret;
double offset, std; double offset, mean, std;
char host[OVNI_MAX_HOSTNAME]; char host[OVNI_MAX_HOSTNAME];
struct ovni_loom *loom; struct ovni_loom *loom;
struct ovni_trace *trace; struct ovni_trace *trace;
@ -485,8 +485,29 @@ load_clock_offsets(struct ovni_emu *emu)
/* Ignore header line */ /* Ignore header line */
fgets(buf, 1024, f); fgets(buf, 1024, f);
while(fscanf(f, "%d %s %lf %lf", &rank, host, &offset, &std) == 4) while(1)
{ {
errno = 0;
ret = fscanf(f, "%d %s %lf %lf %lf", &rank, host, &offset, &mean, &std);
if(ret == EOF)
{
if(errno != 0)
{
perror("fscanf failed");
exit(EXIT_FAILURE);
}
break;
}
if(ret != 5)
{
err("fscanf read %d instead of 5 fields in %s\n",
ret, emu->clock_offset_file);
exit(EXIT_FAILURE);
}
loom = find_loom_by_hostname(emu, host); loom = find_loom_by_hostname(emu, host);
if(loom == NULL) if(loom == NULL)