#include <mLib/alloc.h>
#include <mLib/dstr.h>
+#include <mLib/macros.h>
#include <mLib/report.h>
#include <mLib/str.h>
static size_t gethex(const char *p, octet *q, size_t sz, char **pp)
{
size_t i = 0;
- while (sz > 0 &&
- isxdigit((unsigned char)p[0]) &&
- isxdigit((unsigned char)p[1])) {
+ while (sz > 0 && ISXDIGIT(p[0]) && ISXDIGIT(p[1])) {
char buf[3];
buf[0] = p[0];
buf[1] = p[1];
const encodeops *e;
for (e = encodingtab; e->name; e++) {
- if (strcmp(ename, e->name) == 0)
+ if (STRCMP(ename, ==, e->name))
return (e);
}
return (0);
const gchash *const *g, *gg = 0;
size_t sz = strlen(name);
for (g = ghashtab; *g; g++) {
- if (strncmp(name, (*g)->name, sz) == 0) {
+ if (STRNCMP(name, ==, (*g)->name, sz)) {
if ((*g)->name[sz] == 0) {
gg = *g;
break;
size_t n;
fprogress ff;
- if (!file || strcmp(file, "-") == 0)
+ if (!file || STRCMP(file, ==, "-"))
fp = stdin;
else if ((fp = fopen(file, fh->f & FHF_BINARY ? "rb" : "r")) == 0)
return (-1);
if (fh->f & FHF_JUNK) {
p = file;
- if (strncmp(p, "./", 2) == 0) p += 2;
+ if (STRNCMP(p, ==, "./", 2)) p += 2;
q = p;
ffhe = &fh->ents;
for (;;) {
n = q - p;
for (; *ffhe; ffhe = &(*ffhe)->next) {
fhe = *ffhe;
- if (strncmp(p, fhe->name, n) == 0 && fhe->name[n] == 0)
+ if (STRNCMP(p, ==, fhe->name, n) && fhe->name[n] == 0)
goto found;
}
fhe = xmalloc(offsetof(struct fhent, name) + n + 1);
n++;
}
while (errno = 0, (d = readdir(dp)) != 0) {
- if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0)
+ if (STRCMP(d->d_name, ==, ".") || STRCMP(d->d_name, ==, ".."))
continue;
for (fhe = ents; fhe; fhe = fhe->next) {
- if (strcmp(d->d_name, fhe->name) == 0) goto found;
+ if (STRCMP(d->d_name, ==, fhe->name)) goto found;
}
fhj->d->len = n;
dstr_puts(fhj->d, d->d_name);
if (*p == '#') {
p++;
if ((q = str_getword(&p)) == 0) return (HF_BAD);
- if (strcmp(q, "hash") == 0) {
+ if (STRCMP(q, ==, "hash")) {
if ((q = str_getword(&p)) == 0) return (HF_BAD);
if ((gch = gethash(q)) == 0) return (HF_BAD);
hfp->gch = gch;
return (HF_HASH);
- } else if (strcmp(q, "encoding") == 0) {
+ } else if (STRCMP(q, ==, "encoding")) {
if ((q = str_getword(&p)) == 0) return (HF_BAD);
if ((ee = getencoding(q)) == 0) return (HF_BAD);
hfp->ee = ee;
return (HF_ENC);
- } else if (strcmp(q, "escape") == 0) {
+ } else if (STRCMP(q, ==, "escape")) {
hfp->f |= HFF_ESCAPE;
return (HF_ESC);
}
again:
ch = nextch(in);
- while (isspace(ch))
+ while (ISSPACE(ch))
ch = nextch(in);
if (ch == '#') {
do ch = nextch(in); while (ch != '\n' && ch != eofch);
if (ch == q)
break;
- if (!q && isspace(ch))
+ if (!q && ISSPACE(ch))
break;
/* --- Otherwise contribute and continue --- */
qq = 0;
for (q = p; *q; q++) {
- if (isspace((unsigned char)*q)) {
+ if (ISSPACE(*q)) {
qq = '\"';
break;
}