utils/macros.h: Add <ctype.h> and `foocmp' helper macros.

[mLib] / sel / ident.c

diff --git a/sel/ident.c b/sel/ident.c
index 0017f0a..a59cd22 100644 (file)
--- a/sel/ident.c
+++ b/sel/ident.c
@@ -44,6 +44,7 @@
 #include "dstr.h"
 #include "exc.h"
 #include "ident.h"
+#include "macros.h"
 #include "selbuf.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -77,13 +78,13 @@ static char *next(char **pp)
 
   /* --- Skip past any leading whitespace --- */
 
-  while (isspace((unsigned char)*p))
+  while (ISSPACE(*p))
     p++;
 
   /* --- Now start work on the string itself --- */
 
   for (;;) {
-    if (*p == 0 || *p == ':' || *p == ',' || isspace((unsigned char)*p))
+    if (*p == 0 || *p == ':' || *p == ',' || ISSPACE(*p))
       break;
     else if (*p == '\\') {
       p++;
@@ -97,7 +98,7 @@ static char *next(char **pp)
 
   /* --- Tidy up afterwards --- */
 
-  while (isspace((unsigned char)*p))
+  while (ISSPACE(*p))
     p++;
   if (*p == 0)
     *pp = 0;
@@ -132,11 +133,11 @@ static void parse(char *p, ident_reply *i)
   /* --- Find out what sort of a reply this is --- */
 
   q = next(&p);
-  if (strcmp(q, "USERID") == 0) {
+  if (STRCMP(q, ==, "USERID")) {
     i->type = IDENT_USERID;
     i->u.userid.os = next(&p);
     i->u.userid.user = next(&p);
-  } else if (strcmp(q, "ERROR") == 0) {
+  } else if (STRCMP(q, ==, "ERROR")) {
     i->type = IDENT_ERROR;
     i->u.error = next(&p);
   } else