1c1
< /* $NetBSD: read.c,v 1.12 2002/01/21 19:49:52 tv Exp $ */
---
> /* $NetBSD: read.c,v 1.19 2007/09/28 21:53:50 uwe Exp $ */
37c37
< __RCSID("$NetBSD: read.c,v 1.12 2002/01/21 19:49:52 tv Exp $");
---
> __RCSID("$NetBSD: read.c,v 1.19 2007/09/28 21:53:50 uwe Exp $");
39c39
< __FBSDID("$FreeBSD: stable/10/usr.bin/xlint/lint2/read.c 228992 2011-12-30 11:02:40Z uqs $");
---
> __FBSDID("$FreeBSD: stable/10/usr.bin/xlint/lint2/read.c 281168 2015-04-06 19:56:27Z pfg $");
90c90,91
< static void inperr(void);
---
> #define inperr() inperror(__FILE__, __LINE__)
> static void inperror(const char *, size_t);
216c217
< inperr(void)
---
> inperror(const char *file, size_t line)
219c220
< errx(1, "input file error: %s", fnames[srcfile]);
---
> errx(1, "%s,%zd: input file error: %s", file, line, fnames[srcfile]);
364,366c365
< while ((c = *cp) == 't' || c == 'd' || c == 'e' || c == 'u' ||
< c == 'r' || c == 'o' || c == 's' || c == 'v' ||
< c == 'P' || c == 'S') {
---
> while (strchr("tdeurosvPS", (c = *cp)) != NULL) {
548c547
< u_short tidx;
---
> u_short tidx, sidx;
624c623,624
< tp->t_subt = TP(inptype(cp, &cp));
---
> sidx = inptype(cp, &cp); /* force seq. point! (ditto below) */
> tp->t_subt = TP(sidx);
627c627,628
< tp->t_subt = TP(inptype(cp, &cp));
---
> sidx = inptype(cp, &cp);
> tp->t_subt = TP(sidx);
644c645,646
< tp->t_args[i] = TP(inptype(cp, &cp));
---
> sidx = inptype(cp, &cp);
> tp->t_args[i] = TP(sidx);
648c650,651
< tp->t_subt = TP(inptype(cp, &cp));
---
> sidx = inptype(cp, &cp);
> tp->t_subt = TP(sidx);