if (s >= maxbuf)
return(-1); /* name goes past the end of the buffer */
- ND_TCHECK2(*s, 1);
+ ND_TCHECK_1(s);
c = *s;
if ((c & 0xC0) == 0xC0)
return(2);
while (*s) {
if (s >= maxbuf)
return(-1); /* name goes past the end of the buffer */
- ND_TCHECK2(*s, 1);
+ ND_TCHECK_1(s);
s += (*s) + 1;
- ND_TCHECK2(*s, 1);
+ ND_TCHECK_1(s);
}
return(PTR_DIFF(s, s0) + 1);
ND_TCHECK(*buf);
if (*buf != 4 && *buf != 2) {
- ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", *buf));
+ ND_PRINT((ndo, "Error! ASCIIZ buffer of type %u", EXTRACT_U_1(buf)));
return maxbuf; /* give up */
}
len = 0;