lobo/isync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make journal entry argument processing saner

Browse source 
the mega-if was unreadable and caused lots of churn.
This commit is contained in:
Oswald Buddenhagen 2022-02-08 15:19:19 +01:00
parent 608c724add
commit 91d19cceac
1 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/sync_state.c
View file

@ -279,18 +279,41 @@ load_state( sync_vars_t *svars )
} }
buf[ll] = 0; buf[ll] = 0;
char c; char c;
int tn; int tn, bad;
uint t1, t2, t3, t4; uint t1, t2, t3, t4;
if ((c = buf[0]) == '#' ? switch ((c = buf[0])) {
(tn = 0, (sscanf( buf + 2, "%u %u %n", &t1, &t2, &tn ) < 2) || !tn || (ll - (uint)tn != TUIDL + 2)) : case '#':
c == '!' ? tn = 0;
(sscanf( buf + 2, "%u", &t1 ) != 1) : bad = (sscanf( buf + 2, "%u %u %n", &t1, &t2, &tn ) < 2) || !tn || (ll - (uint)tn != TUIDL + 2);
c == 'N' || c == 'F' || c == 'T' || c == '+' || c == '&' || c == '-' || c == '=' || c == '_' || c == '|' ? break;
(sscanf( buf + 2, "%u %u", &t1, &t2 ) != 2) : case '!':
c != '^' ? bad = sscanf( buf + 2, "%u", &t1 ) != 1;
(sscanf( buf + 2, "%u %u %u", &t1, &t2, &t3 ) != 3) : break;
(sscanf( buf + 2, "%u %u %u %u", &t1, &t2, &t3, &t4 ) != 4)) case 'N':
{ case 'F':
case 'T':
case '+':
case '&':
case '-':
case '=':
case '_':
case '|':
bad = sscanf( buf + 2, "%u %u", &t1, &t2 ) != 2;
break;
case '<':
case '>':
case '*':
case '~':
bad = sscanf( buf + 2, "%u %u %u", &t1, &t2, &t3 ) != 3;
break;
case '^':
bad = sscanf( buf + 2, "%u %u %u %u", &t1, &t2, &t3, &t4 ) != 4;
break;
default:
error( "Error: unrecognized journal entry at %s:%d\n", svars->jname, line );
goto jbail;
}
if (bad) {
error( "Error: malformed journal entry at %s:%d\n", svars->jname, line ); error( "Error: malformed journal entry at %s:%d\n", svars->jname, line );
goto jbail; goto jbail;
} }
@ -373,8 +396,7 @@ load_state( sync_vars_t *svars )
srec = upgrade_srec( svars, srec ); srec = upgrade_srec( svars, srec );
break; break;
default: default:
error( "Error: unrecognized journal entry at %s:%d\n", svars->jname, line ); assert( !"Unhandled journal entry" );
goto jbail;
} }
} }
} }