#include <string.h>
#include "dstr.h"
+#include "macros.h"
#include "report.h"
#include "quis.h"
#include "testrig.h"
/* --- Skip leading whitespace --- */
- while (isspace((unsigned char)ch))
+ while (ISSPACE(ch))
ch = getc(fp);
/* --- Trap some special characters --- */
case '`':
goto done;
default:
- if (isspace((unsigned char)ch))
+ if (ISSPACE(ch))
goto done;
}
if (ch == '\\') {
goto done;
}
- if (strcmp(tok.buf, "SUITE") == 0) {
+ if (STRCMP(tok.buf, ==, "SUITE")) {
t = gettok(fp);
if (t != TOK_WORD) {
moan("expected <word>; found `%s'", decode(t));
chunks = 0;
break;
}
- if (strcmp(tok.buf, ss->name) == 0) {
+ if (STRCMP(tok.buf, ==, ss->name)) {
chunks = ss->chunks;
break;
}
for (cch = chunks; ; cch++) {
if (!cch->name)
goto skip_chunk;
- if (strcmp(tok.buf, cch->name) == 0)
+ if (STRCMP(tok.buf, ==, cch->name))
break;
}
if (i >= argc - 1)
break;
p = argv[++i];
- if (strcmp(p, "--") == 0) {
+ if (STRCMP(p, ==, "--")) {
i++;
break;
}