X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb/blobdiff_plain/e74ca64c0ec65a93d2f133c4472256e3bbb688e2..141c12847a1c2f8cc8db03d420551584e689fb87:/key/key-attr.c

diff --git a/key/key-attr.c b/key/key-attr.c
index e884d699..567fb92f 100644
--- a/key/key-attr.c
+++ b/key/key-attr.c
@@ -34,6 +34,7 @@
 #include <time.h>
 
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/sym.h>
 
 #include "key.h"
@@ -54,7 +55,7 @@ int key_chkident(const char *p)
   if (!p || !*p || strlen(p) > 255)
     return (-1);
   while (*p) {
-    if (*p == ':' || *p == '.' || isspace((unsigned char)*p))
+    if (*p == ':' || *p == '.' || ISSPACE(*p))
       return (-1);
     p++;
   }
@@ -252,8 +253,7 @@ int key_settag(key_file *f, key *k, const char *tag)
 
   /* --- See if the new tag is the same as the old one --- */
 
-  if ((!tag && !k->tag) ||
-      (tag && k->tag && strcmp(tag, k->tag) == 0))
+  if ((!tag && !k->tag) || (tag && k->tag && STRCMP(tag, ==, k->tag)))
     return (0);
 
   /* --- Allocate an entry for the new tag --- */