Remove redundant initialization of `sub'.

[mLib] / ident.c

diff --git a/ident.c b/ident.c
index 342dc81551c2d7ac142110ba03465fb131ff4459..4d8888f7ccc0c241065f2e61be90efa65d4248fd 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ident.c,v 1.1 1999/10/04 21:41:58 mdw Exp $
+ * $Id: ident.c,v 1.3 2000/10/08 11:17:45 mdw Exp $
  *
  * Nonblocking RFC931 client
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: ident.c,v $
+ * Revision 1.3  2000/10/08 11:17:45  mdw
+ * (ident_socket): change sizes to be @size_t@.
+ *
+ * Revision 1.2  2000/06/17 10:38:35  mdw
+ * Track changes to selbuf interface.
+ *
  * Revision 1.1  1999/10/04 21:41:58  mdw
  * Added ident client from `fw'.
  *
@@ -168,7 +174,6 @@ static void line(char *s, void *p)
   ident_request *rq = p;
 
   rq->state = IDENT_DONE;
-  selbuf_disable(&rq->b);
   close(rq->b.reader.fd);
   if (!s)
     rq->func(0, rq->p);
@@ -177,6 +182,7 @@ static void line(char *s, void *p)
     parse(s, &i);
     rq->func(&i, rq->p);
   }
+  selbuf_destroy(&rq->b);
 }
 
 /* --- @connected@ --- *
@@ -247,8 +253,8 @@ void ident_abort(ident_request *rq)
       conn_kill(&rq->c);
       break;
     case IDENT_READ:
-      selbuf_disable(&rq->b);
       close(rq->b.reader.fd);
+      selbuf_destroy(&rq->b);
       break;
   }
 }
@@ -354,7 +360,7 @@ void ident_socket(ident_request *rq, sel_state *s, int sk,
                  void (*func)(ident_reply */*i*/, void */*p*/),
                  void *p)
 {
-  int sinsz;
+  size_t sinsz;
   if ((sinsz = sizeof(struct sockaddr_in),
        getsockname(sk, (struct sockaddr *)&rq->local, &sinsz)) ||
       (sinsz = sizeof(struct sockaddr_in),