It is still not the 80s anymore -- remove all caddr_ts

3 files changed, 5 insertions, 5 deletions

diff --git a/zhm/queue.c b/zhm/queue.c
index b028f7c..c44a19a 100644
--- a/zhm/queue.c
+++ b/zhm/queue.c
@@ -22,7 +22,7 @@ typedef struct _Queue {
     Timer *timer;
     int retries;
     ZNotice_t notice;
-    caddr_t packet;
+    void *packet;
     struct sockaddr_in reply;
     struct _Queue *next, **prev_p;
 } Queue;
@@ -176,7 +176,7 @@ static Code_t
 dump_queue(void)
 {
     Queue *entry;
-    caddr_t mp;
+    void *mp;
     int ml;
 
     DPR("Dumping queue...\n");
diff --git a/zhm/timer.c b/zhm/timer.c
index 4fb764e..296b47e 100644
--- a/zhm/timer.c
+++ b/zhm/timer.c
@@ -50,11 +50,11 @@ static const char rcsid[] =
  * Timer *timer_set_rel (time_rel, proc, arg)
  *      long time_rel;
  *      void (*proc)();
- *      caddr_t arg;
+ *      void *arg;
  * Timer *timer_set_abs (time_abs, proc, arg)
  *      long time_abs;
  *      void (*proc)();
- *      caddr_t arg;
+ *      void *arg;
  *
  * void timer_reset(tmr)
  *      Timer *tmr;
diff --git a/zhm/zhm.c b/zhm/zhm.c
index cfce24c..fb6e7c3 100644
--- a/zhm/zhm.c
+++ b/zhm/zhm.c
@@ -495,7 +495,7 @@ detach(void)
 	   * doesn't already have one.  POSIX systems won't include
 	   * <sys/ioctl.h> (see ../h/sysdep.h); if TIOCNOTTY is defined anyway,
 	   * this is unnecessary but won't hurt. */
-	  ioctl(i, TIOCNOTTY, (caddr_t) 0);
+	  ioctl(i, TIOCNOTTY, NULL);
 #endif
 	  close(i);
      }