struct mod *mod;
for (mod = _modules; mod != NULL; mod = mod->next) {
- if (strcmp(mod->name, modname) == 0)
+ if (streq(mod->name, modname))
return mod;
}
#include <string.h>
#include <unistd.h>
+#include <shared/util.h>
+
#include <libkmod/libkmod.h>
/* good luck bulding a kmod_list outside of the library... makes this blacklist
const char *modname;
mod = kmod_module_get_module(l);
modname = kmod_module_get_name(mod);
- if (strcmp("pcspkr", modname) == 0 || strcmp("floppy", modname) == 0)
+ if (streq("pcspkr", modname) || streq("floppy", modname))
goto fail;
len++;
kmod_module_unref(mod);
#include <string.h>
#include <unistd.h>
+#include <shared/util.h>
+
#include <libkmod/libkmod.h>
#include "testsuite.h"
struct kmod_module *m = kmod_module_get_module(l);
const char *name = kmod_module_get_name(m);
- if (strcmp(name, "crc16") == 0)
+ if (streq(name, "crc16"))
crc16 = 1;
- if (strcmp(name, "mbcache") == 0)
+ if (streq(name, "mbcache"))
mbcache = 1;
- else if (strcmp(name, "jbd2") == 0)
+ else if (streq(name, "jbd2"))
jbd2 = 1;
kmod_module_unref(m);
#include <unistd.h>
#include <shared/hash.h>
+#include <shared/util.h>
#include "testsuite.h"
assert_return(hash_get_count(h) == 3, EXIT_FAILURE);
v = hash_find(h, "k1");
- assert_return(strcmp(v, v4) == 0, EXIT_FAILURE);
+ assert_return(streq(v, v4), EXIT_FAILURE);
assert_return(freecount == 1, EXIT_FAILURE);
assert_return(hash_get_count(h) == 3, EXIT_FAILURE);
v = hash_find(h, "k1");
- assert_return(strcmp(v, v1) == 0, EXIT_FAILURE);
+ assert_return(streq(v, v1), EXIT_FAILURE);
assert_return(freecount == 0, EXIT_FAILURE);
#include <unistd.h>
#include <shared/strbuf.h>
+#include <shared/util.h>
#include "testsuite.h"
result1 = (char *) strbuf_str(&buf);
assert_return(result1 == buf.bytes, EXIT_FAILURE);
- assert_return(strcmp(result1, TEXT) == 0, EXIT_FAILURE);
+ assert_return(streq(result1, TEXT), EXIT_FAILURE);
result1 = strdup(result1);
result2 = strbuf_steal(&buf);
- assert_return(strcmp(result1, result2) == 0, EXIT_FAILURE);
+ assert_return(streq(result1, result2), EXIT_FAILURE);
free(result1);
free(result2);
strbuf_popchar(&buf);
result1 = (char *) strbuf_str(&buf);
assert_return(result1 == buf.bytes, EXIT_FAILURE);
- assert_return(strcmp(result1, TEXT) == 0, EXIT_FAILURE);
+ assert_return(streq(result1, TEXT), EXIT_FAILURE);
strbuf_popchars(&buf, lastwordlen);
result2 = strbuf_steal(&buf);
- assert_return(strcmp(TEXT, result2) != 0, EXIT_FAILURE);
+ assert_return(!streq(TEXT, result2), EXIT_FAILURE);
assert_return(strncmp(TEXT, result2, strlen(TEXT) - lastwordlen) == 0,
EXIT_FAILURE);
assert_return(result2[strlen(TEXT) - lastwordlen] == '\0',
#include <sys/types.h>
#include <sys/utsname.h>
+#include <shared/util.h>
+
#include <libkmod/libkmod.h>
#include "testsuite.h"
if (err < 0)
exit(EXIT_FAILURE);
- if (strcmp(u.release, TEST_UNAME) != 0) {
+ if (!streq(u.release, TEST_UNAME)) {
char *ldpreload = getenv("LD_PRELOAD");
ERR("u.release=%s should be %s\n", u.release, TEST_UNAME);
ERR("LD_PRELOAD=%s\n", ldpreload);
if (n != 1)
return EXIT_FAILURE;
- if (strcmp(s, "kmod-test-chroot-works") != 0)
+ if (!streq(s, "kmod-test-chroot-works"))
return EXIT_FAILURE;
return EXIT_SUCCESS;
buf[done] = '\0';
- if (strcmp(buf, "kmod-test-chroot-works\n") != 0)
+ if (!streq(buf, "kmod-test-chroot-works\n"))
return EXIT_FAILURE;
return EXIT_SUCCESS;
const struct test *t;
for (t = start; t < stop; t++) {
- if (strcmp(t->name, name) == 0)
+ if (streq(t->name, name))
return t;
}
buf[r] = '\0';
bufmatch[r] = '\0';
- if (strcmp(buf, bufmatch) != 0) {
+ if (!streq(buf, bufmatch)) {
ERR("Outputs do not match on %s:\n",
fd_match == fd_matchout ? "stdout" : "stderr");
ERR("correct:\n%s\n", bufmatch);