Track changes to selbuf interface.

diff --git a/bres.c b/bres.c
index 99bf051135d16d9fe76d343df84aeac3194f04aa..497115317bbf47f664abd37b8c0a85e56222b682 100644 (file)
--- a/bres.c
+++ b/bres.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: bres.c,v 1.2 1999/10/30 11:28:39 mdw Exp $
+ * $Id: bres.c,v 1.3 2000/06/17 10:38:35 mdw Exp $

  *
  * Background reverse name resolution
  *
  *
  * Background reverse name resolution
  *


@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bres.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bres.c,v $

+ * Revision 1.3  2000/06/17 10:38:35  mdw
+ * Track changes to selbuf interface.
+ *

  * Revision 1.2  1999/10/30 11:28:39  mdw
  * Fix include error, pointed out by Chris Rutter.
  *
  * Revision 1.2  1999/10/30 11:28:39  mdw
  * Fix include error, pointed out by Chris Rutter.
  *


@@ -316,15 +319,15 @@ static struct hostent *gethost(int fd)
 
     h->h_name = a;
     PUT(name);
 
     h->h_name = a;
     PUT(name);

-    free(name);
+    xfree(name);

     h->h_aliases = p;
     for (i = 0; i < hsk.nalias; i++) {
       *p++ = a;
       PUT(alias[i]);
     h->h_aliases = p;
     for (i = 0; i < hsk.nalias; i++) {
       *p++ = a;
       PUT(alias[i]);

-      free(alias[i]);
+      xfree(alias[i]);

     }
     *p++ = 0;
     }
     *p++ = 0;

-    free(alias);
+    xfree(alias);

  
 #undef PUT
   }
  
 #undef PUT
   }


@@ -337,11 +340,11 @@ tidy_2:
   {
     int i;
     for (i = 0; i < hsk.nalias && alias[i]; i++)
   {
     int i;
     for (i = 0; i < hsk.nalias && alias[i]; i++)

-      free(alias[i]);
-    free(alias);
+      xfree(alias[i]);
+    xfree(alias);

   }
 tidy_1:
   }
 tidy_1:

-  free(name);
+  xfree(name);

 tidy_0:
   return (0);
 }
 tidy_0:
   return (0);
 }


@@ -596,7 +599,7 @@ static void zap(bres_server *rs)
 void bres_abort(bres_client *rc)
 {
   if (rc->q == BRES_BYNAME)
 void bres_abort(bres_client *rc)
 {
   if (rc->q == BRES_BYNAME)

-    free(rc->u.name);
+    xfree(rc->u.name);

   if (rc->rs) {
     sel_rmfile(&rc->rs->f);
     zap(rc->rs);
   if (rc->rs) {
     sel_rmfile(&rc->rs->f);
     zap(rc->rs);


@@ -663,10 +666,10 @@ static void answer(int fd, unsigned mode, void *vp)
   if (rc) {
     rc->func(h, rc->p);
     if (rc->q == BRES_BYNAME)
   if (rc) {
     rc->func(h, rc->p);
     if (rc->q == BRES_BYNAME)

-      free(rc->u.name);
+      xfree(rc->u.name);

   }
   if (h)
   }
   if (h)

-    free(h);
+    xfree(h);

   if (fail)
     zap(rs);
   if (!rc)
   if (fail)
     zap(rs);
   if (!rc)


@@ -854,7 +857,7 @@ again:
 lost:
   rc->func(0, rc->p);
   if (rc->q == BRES_BYNAME)
 lost:
   rc->func(0, rc->p);
   if (rc->q == BRES_BYNAME)

-    free(rc->u.name);
+    xfree(rc->u.name);

 }
 
 /* --- @resolve@ --- *
 }
 
 /* --- @resolve@ --- *

diff --git a/ident.c b/ident.c
index 342dc81551c2d7ac142110ba03465fb131ff4459..6d29f90ee90e29e84210e3a9d2ba5302276e0816 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: ident.c,v 1.1 1999/10/04 21:41:58 mdw Exp $
+ * $Id: ident.c,v 1.2 2000/06/17 10:38:35 mdw Exp $

  *
  * Nonblocking RFC931 client
  *
  *
  * Nonblocking RFC931 client
  *


@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: ident.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: ident.c,v $

+ * 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'.
  *
  * Revision 1.1  1999/10/04 21:41:58  mdw
  * Added ident client from `fw'.
  *


@@ -168,7 +171,6 @@ static void line(char *s, void *p)
   ident_request *rq = p;
 
   rq->state = IDENT_DONE;
   ident_request *rq = p;
 
   rq->state = IDENT_DONE;

-  selbuf_disable(&rq->b);

   close(rq->b.reader.fd);
   if (!s)
     rq->func(0, rq->p);
   close(rq->b.reader.fd);
   if (!s)
     rq->func(0, rq->p);


@@ -177,6 +179,7 @@ static void line(char *s, void *p)
     parse(s, &i);
     rq->func(&i, rq->p);
   }
     parse(s, &i);
     rq->func(&i, rq->p);
   }

+  selbuf_destroy(&rq->b);

 }
 
 /* --- @connected@ --- *
 }
 
 /* --- @connected@ --- *


@@ -247,8 +250,8 @@ void ident_abort(ident_request *rq)
       conn_kill(&rq->c);
       break;
     case IDENT_READ:
       conn_kill(&rq->c);
       break;
     case IDENT_READ:

-      selbuf_disable(&rq->b);

       close(rq->b.reader.fd);
       close(rq->b.reader.fd);

+      selbuf_destroy(&rq->b);

       break;
   }
 }
       break;
   }
 }