X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=test-tool%2Ftest-tool.c;h=93aaca20162b270cf753e918166ded7ab86c0595;hb=7d8a3404b27fcd71f84dbe4c022c4435d0070d6b;hp=c1a3de7cee666f64d5c22fe1dfd1ece4e030b7d1;hpb=8869adf1e811d894088dbb0f371edc23299005c8;p=libguestfs.git

diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index c1a3de7..93aaca2 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -41,6 +41,16 @@
 #define N_(str) str
 #endif
 
+#define STREQ(a,b) (strcmp((a),(b)) == 0)
+#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0)
+#define STRNEQ(a,b) (strcmp((a),(b)) != 0)
+#define STRCASENEQ(a,b) (strcasecmp((a),(b)) != 0)
+#define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0)
+#define STRCASEEQLEN(a,b,n) (strncasecmp((a),(b),(n)) == 0)
+#define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 0)
+#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
+#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
+
 #define DEFAULT_TIMEOUT 120
 
 static const char *helper = DEFAULT_HELPER;
@@ -100,11 +110,11 @@ main (int argc, char *argv[])
 
     switch (c) {
     case 0:			/* options which are long only */
-      if (strcmp (long_options[option_index].name, "helper") == 0)
+      if (STREQ (long_options[option_index].name, "helper"))
         helper = optarg;
-      else if (strcmp (long_options[option_index].name, "qemu") == 0)
+      else if (STREQ (long_options[option_index].name, "qemu"))
         set_qemu (optarg, 0);
-      else if (strcmp (long_options[option_index].name, "qemudir") == 0)
+      else if (STREQ (long_options[option_index].name, "qemudir"))
         set_qemu (optarg, 1);
       else {
         fprintf (stderr,
@@ -145,7 +155,7 @@ main (int argc, char *argv[])
 
   /* Print out any environment variables which may relate to this test. */
   for (i = 0; environ[i] != NULL; ++i)
-    if (strncmp (environ[i], "LIBGUESTFS_", 11) == 0)
+    if (STREQLEN (environ[i], "LIBGUESTFS_", 11))
       printf ("%s\n", environ[i]);
 
   /* Create the handle and configure it. */