X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/18c831dcd0ae4d660c70ccac69d27ed2a97851be..db0e70a131f1a3a28cc78cface5b5db87b0d5416:/sel/ident.c

diff --git a/sel/ident.c b/sel/ident.c
index bff6ea2..a59cd22 100644
--- 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
@@ -282,7 +283,7 @@ static void go(ident_request *rq)
   sin.sin_addr = rq->remote.sin_addr;
   if (conn_init(&rq->c, rq->s, fd, (struct sockaddr *)&sin, sizeof(sin),
 		connected, rq))
-    goto fail_1;
+    goto fail_0;
 
   /* --- Finish off initializing the block --- */
 
@@ -346,7 +347,7 @@ void ident_socket(ident_request *rq, sel_state *s, int sk,
 		  void (*func)(ident_reply */*i*/, void */*p*/),
 		  void *p)
 {
-  size_t sinsz;
+  socklen_t sinsz;
   if ((sinsz = sizeof(struct sockaddr_in),
        getsockname(sk, (struct sockaddr *)&rq->local, &sinsz)) ||
       (sinsz = sizeof(struct sockaddr_in),