From 71928f99ec3b0f5984d83438da266c7ef97afb5a Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@1ts.org>
Date: Wed, 2 Feb 2011 05:26:26 +0000
Subject: It is still not the 80s anymore -- remove all caddr_ts

---
 zwgc/X_driver.c | 46 +++++++++++++++++++++++-----------------------
 zwgc/X_gram.c   |  2 +-
 zwgc/xcut.c     |  4 ++--
 zwgc/xshow.c    |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'zwgc')

diff --git a/zwgc/X_driver.c b/zwgc/X_driver.c
index a51ddd1..51c8ea0 100644
--- a/zwgc/X_driver.c
+++ b/zwgc/X_driver.c
@@ -210,31 +210,31 @@ x_string_to_color(char *name,
  */
 
 static XrmOptionDescRec cmd_options[] = {
-    {"+rv",          "*reverseVideo", XrmoptionNoArg,  (caddr_t) "off"},
-    {"+synchronous", "*synchronous",  XrmoptionNoArg,  (caddr_t) "off"},
-    {"-background",  "*background",   XrmoptionSepArg, (caddr_t) NULL},
-    {"-bd",          "*borderColor",  XrmoptionSepArg, (caddr_t) NULL},
-    {"-bg",          "*background",   XrmoptionSepArg, (caddr_t) NULL},
-    {"-bordercolor", "*borderColor",  XrmoptionSepArg, (caddr_t) NULL},
-    {"-borderwidth", ".borderWidth",  XrmoptionSepArg, (caddr_t) NULL},
-    {"-bw",          ".borderWidth",  XrmoptionSepArg, (caddr_t) NULL},
-    {"-display",     ".display",      XrmoptionSepArg, (caddr_t) NULL},
-    {"-fg",          "*foreground",   XrmoptionSepArg, (caddr_t) NULL},
-    {"-fn",          "*font",         XrmoptionSepArg, (caddr_t) NULL},
-    {"-font",        "*font",         XrmoptionSepArg, (caddr_t) NULL},
-    {"-foreground",  "*foreground",   XrmoptionSepArg, (caddr_t) NULL},
-    {"-geometry",    ".geometry",     XrmoptionSepArg, (caddr_t) NULL},
-    {"-iconname",    ".iconName",     XrmoptionSepArg, (caddr_t) NULL},
+    {"+rv",          "*reverseVideo", XrmoptionNoArg,  (XPointer) "off"},
+    {"+synchronous", "*synchronous",  XrmoptionNoArg,  (XPointer) "off"},
+    {"-background",  "*background",   XrmoptionSepArg, (XPointer) NULL},
+    {"-bd",          "*borderColor",  XrmoptionSepArg, (XPointer) NULL},
+    {"-bg",          "*background",   XrmoptionSepArg, (XPointer) NULL},
+    {"-bordercolor", "*borderColor",  XrmoptionSepArg, (XPointer) NULL},
+    {"-borderwidth", ".borderWidth",  XrmoptionSepArg, (XPointer) NULL},
+    {"-bw",          ".borderWidth",  XrmoptionSepArg, (XPointer) NULL},
+    {"-display",     ".display",      XrmoptionSepArg, (XPointer) NULL},
+    {"-fg",          "*foreground",   XrmoptionSepArg, (XPointer) NULL},
+    {"-fn",          "*font",         XrmoptionSepArg, (XPointer) NULL},
+    {"-font",        "*font",         XrmoptionSepArg, (XPointer) NULL},
+    {"-foreground",  "*foreground",   XrmoptionSepArg, (XPointer) NULL},
+    {"-geometry",    ".geometry",     XrmoptionSepArg, (XPointer) NULL},
+    {"-iconname",    ".iconName",     XrmoptionSepArg, (XPointer) NULL},
 #ifdef CMU_ZWGCPLUS
-    {"-lifespan",    "*lifespan",     XrmoptionSepArg, (caddr_t) NULL},
+    {"-lifespan",    "*lifespan",     XrmoptionSepArg, (XPointer) NULL},
 #endif
-    {"-name",        ".name",         XrmoptionSepArg, (caddr_t) NULL},
-    {"-reverse",     "*reverseVideo", XrmoptionNoArg,  (caddr_t) "on"},
-    {"-rv",          "*reverseVideo", XrmoptionNoArg,  (caddr_t) "on"},
-    {"-transient",   "*transient",    XrmoptionNoArg,  (caddr_t) "on"},
-    {"-synchronous", "*synchronous",  XrmoptionNoArg,  (caddr_t) "on"},
-    {"-title",       ".title",        XrmoptionSepArg, (caddr_t) NULL},
-    {"-xrm",         NULL,            XrmoptionResArg, (caddr_t) NULL} };
+    {"-name",        ".name",         XrmoptionSepArg, (XPointer) NULL},
+    {"-reverse",     "*reverseVideo", XrmoptionNoArg,  (XPointer) "on"},
+    {"-rv",          "*reverseVideo", XrmoptionNoArg,  (XPointer) "on"},
+    {"-transient",   "*transient",    XrmoptionNoArg,  (XPointer) "on"},
+    {"-synchronous", "*synchronous",  XrmoptionNoArg,  (XPointer) "on"},
+    {"-title",       ".title",        XrmoptionSepArg, (XPointer) NULL},
+    {"-xrm",         NULL,            XrmoptionResArg, (XPointer) NULL} };
 
 #define NUMBER_OF_OPTIONS ((sizeof (cmd_options))/ sizeof(cmd_options[0]))
 
diff --git a/zwgc/X_gram.c b/zwgc/X_gram.c
index bd3ab5b..998d087 100644
--- a/zwgc/X_gram.c
+++ b/zwgc/X_gram.c
@@ -371,7 +371,7 @@ x_gram_create(Display *dpy,
         XChangeProperty(dpy, w, net_wm_desktop, XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &all_desktops, 1);
 
-    XSaveContext(dpy, w, desc_context, (caddr_t)gram);
+    XSaveContext(dpy, w, desc_context, (XPointer)gram);
 
     gram->can_die.tv_sec = 0;
 
diff --git a/zwgc/xcut.c b/zwgc/xcut.c
index b82d9a8..fea0c27 100644
--- a/zwgc/xcut.c
+++ b/zwgc/xcut.c
@@ -132,7 +132,7 @@ xunmark(Display *dpy,
 	XContext desc_context)
 {
    if (gram == NULL)
-     if (XFindContext(dpy, w, desc_context, (caddr_t *) &gram))
+     if (XFindContext(dpy, w, desc_context, (XPointer *) &gram))
        return;
 
    xmarkClear();
@@ -206,7 +206,7 @@ xcut(Display *dpy,
      * If event is for a window that's not ours anymore (say we're
      * in the process of deleting it...), ignore it:
      */
-    if (XFindContext(dpy, w, desc_context, (caddr_t *) &gram))
+    if (XFindContext(dpy, w, desc_context, (XPointer *) &gram))
       return;
 
     /*
diff --git a/zwgc/xshow.c b/zwgc/xshow.c
index 026c954..894e25d 100644
--- a/zwgc/xshow.c
+++ b/zwgc/xshow.c
@@ -602,7 +602,7 @@ xhandleevent(Display *dpy,
 {
     x_gram *gram;
     
-    if (XFindContext(dpy, w, desc_context, (caddr_t *)&gram))
+    if (XFindContext(dpy, w, desc_context, (XPointer *)&gram))
       return;
 
     if (event->type == Expose)
-- 
cgit v1.2.3