eliminate casts of NULL for String* and Cardinal*, since those are unnecessary

as well as interfere with proposed const-string changes.

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>

26 files changed, 119 insertions, 119 deletions

diff --git a/src/ActionHook.c b/src/ActionHook.c
index b03a116..ade4e70 100644
--- a/src/ActionHook.c
+++ b/src/ActionHook.c
@@ -136,7 +136,7 @@ void XtRemoveActionHook(
     else {
 	XtAppWarningMsg(app, "badId", "xtRemoveActionHook", XtCXtToolkitError,
 			"XtRemoveActionHook called with bad or old hook id",
-			(String*)NULL, (Cardinal*)NULL);
+			NULL, NULL);
     }
 #endif /*DEBUG*/
     UNLOCK_APP(app);
diff --git a/src/Callback.c b/src/Callback.c
index 5064a6e..842f5e2 100644
--- a/src/Callback.c
+++ b/src/Callback.c
@@ -172,7 +172,7 @@ void XtAddCallback(
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtAddCallback,XtCXtToolkitError,
               "Cannot find callback list in XtAddCallback",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -241,7 +241,7 @@ void XtAddCallbacks(
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtAddCallback,XtCXtToolkitError,
               "Cannot find callback list in XtAddCallbacks",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -332,7 +332,7 @@ void XtRemoveCallback (
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtRemoveCallback,XtCXtToolkitError,
               "Cannot find callback list in XtRemoveCallback",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -370,7 +370,7 @@ void XtRemoveCallbacks (
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtRemoveCallback,XtCXtToolkitError,
               "Cannot find callback list in XtRemoveCallbacks",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -455,7 +455,7 @@ void XtRemoveAllCallbacks(
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtRemoveAllCallback,XtCXtToolkitError,
               "Cannot find callback list in XtRemoveAllCallbacks",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -553,7 +553,7 @@ void XtCallCallbacks(
 	XtAppWarningMsg(app,
 	       XtNinvalidCallbackList,XtNxtCallCallback,XtCXtToolkitError,
               "Cannot find callback list in XtCallCallbacks",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
diff --git a/src/Converters.c b/src/Converters.c
index 6798194..3402a24 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -312,7 +312,7 @@ Boolean XtCvtIntToBoolean(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToBoolean",XtCXtToolkitError,
                   "Integer to Boolean conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(Boolean, (*(int *)fromVal->addr != 0));
 }
 
@@ -330,7 +330,7 @@ Boolean XtCvtIntToShort(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToShort",XtCXtToolkitError,
                   "Integer to Short conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(short, (*(int *)fromVal->addr));
 }
 
@@ -349,7 +349,7 @@ Boolean XtCvtStringToBoolean(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToBoolean",XtCXtToolkitError,
                   "String to Boolean conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 
     if (   (CompareISOLatin1(str, "true") == 0)
 	|| (CompareISOLatin1(str, "yes") == 0)
@@ -379,7 +379,7 @@ Boolean XtCvtIntToBool(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToBool",XtCXtToolkitError,
                   "Integer to Bool conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(Bool, (*(int *)fromVal->addr != 0));
 }
 
@@ -399,7 +399,7 @@ Boolean XtCvtStringToBool(
 		XtNwrongParameters,"cvtStringToBool",
 		XtCXtToolkitError,
                  "String to Bool conversion needs no extra arguments",
-                  (String *)NULL, (Cardinal *)NULL);
+                  NULL, NULL);
 
     if (   (CompareISOLatin1(str, "true") == 0)
 	|| (CompareISOLatin1(str, "yes") == 0)
@@ -440,7 +440,7 @@ Boolean XtCvtIntToColor(
       XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	 XtNwrongParameters,"cvtIntOrPixelToXColor",XtCXtToolkitError,
          "Pixel to color conversion needs screen and colormap arguments",
-          (String *)NULL, (Cardinal *)NULL);
+          NULL, NULL);
       return False;
     }
     screen = *((Screen **) args[0].addr);
@@ -474,7 +474,7 @@ Boolean XtCvtStringToPixel(
      XtAppWarningMsg(pd->appContext, XtNwrongParameters, "cvtStringToPixel",
 		     XtCXtToolkitError,
 	"String to pixel conversion needs screen and colormap arguments",
-        (String *)NULL, (Cardinal *)NULL);
+        NULL, NULL);
      return False;
     }
 
@@ -534,7 +534,7 @@ static void FreePixel(
     if (*num_args != 2) {
      XtAppWarningMsg(app, XtNwrongParameters,"freePixel",XtCXtToolkitError,
 	"Freeing a pixel requires screen and colormap arguments",
-        (String *)NULL, (Cardinal *)NULL);
+        NULL, NULL);
      return;
     }
 
@@ -564,7 +564,7 @@ static void FetchDisplayArg(
     if (widget == NULL)
 	XtErrorMsg("missingWidget", "fetchDisplayArg", XtCXtToolkitError,
 		   "FetchDisplayArg called without a widget to reference",
-		   (String*)NULL, (Cardinal*)NULL);
+		   NULL, NULL);
         /* can't return any useful Display and caller will de-ref NULL,
 	   so aborting is the only useful option */
 
@@ -675,7 +675,7 @@ Boolean XtCvtStringToCursor(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	     XtNwrongParameters,"cvtStringToCursor",XtCXtToolkitError,
              "String to cursor conversion needs display argument",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
 	return False;
     }
 
@@ -704,7 +704,7 @@ static void FreeCursor(
      XtAppWarningMsg(app,
 	     XtNwrongParameters,"freeCursor",XtCXtToolkitError,
              "Free Cursor requires display argument",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
      return;
     }
 
@@ -727,7 +727,7 @@ Boolean XtCvtStringToDisplay(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToDisplay",XtCXtToolkitError,
                   "String to Display conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 
     d = XOpenDisplay((char *)fromVal->addr);
     if (d != NULL)
@@ -753,7 +753,7 @@ Boolean XtCvtStringToFile(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		 XtNwrongParameters,"cvtStringToFile",XtCXtToolkitError,
                  "String to File conversion needs no extra arguments",
-                 (String *) NULL, (Cardinal *)NULL);
+                 NULL, NULL);
 
     f = fopen((char *)fromVal->addr, "r");
     if (f != NULL)
@@ -775,7 +775,7 @@ static void FreeFile(
 	XtAppWarningMsg(app,
 		 XtNwrongParameters,"freeFile",XtCXtToolkitError,
                  "Free File requires no extra arguments",
-                 (String *) NULL, (Cardinal *)NULL);
+                 NULL, NULL);
 
     fclose( *(FILE**)toVal->addr );
 }
@@ -793,7 +793,7 @@ Boolean XtCvtIntToFloat(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToFloat",XtCXtToolkitError,
                   "Integer to Float conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(float, (*(int *)fromVal->addr));
 }
 
@@ -819,7 +819,7 @@ Boolean XtCvtStringToFloat(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		 XtNwrongParameters,"cvtStringToFloat",XtCXtToolkitError,
                  "String to Float conversion needs no extra arguments",
-                 (String *) NULL, (Cardinal *)NULL);
+                 NULL, NULL);
 
     ret = sscanf (fromVal->addr, "%g", &f);
     if (ret == 0) {
@@ -847,7 +847,7 @@ Boolean XtCvtStringToFont(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	     XtNwrongParameters,"cvtStringToFont",XtCXtToolkitError,
              "String to font conversion needs display argument",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
 	return False;
     }
 
@@ -898,7 +898,7 @@ Boolean XtCvtStringToFont(
     XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		    "noFont","cvtStringToFont",XtCXtToolkitError,
 		    "Unable to load any usable ISO8859 font",
-		    (String *) NULL, (Cardinal *)NULL);
+		    NULL, NULL);
 
     return False;
 }
@@ -916,7 +916,7 @@ static void FreeFont(
 	XtAppWarningMsg(app,
 	     XtNwrongParameters,"freeFont",XtCXtToolkitError,
              "Free Font needs display argument",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
 	return;
     }
 
@@ -937,7 +937,7 @@ Boolean XtCvtIntToFont(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	   XtNwrongParameters,"cvtIntToFont",XtCXtToolkitError,
            "Integer to Font conversion needs no extra arguments",
-            (String *) NULL, (Cardinal *)NULL);
+            NULL, NULL);
     done(Font, *(int*)fromVal->addr);
 }
 
@@ -960,7 +960,7 @@ Boolean XtCvtStringToFontSet(
       XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
            XtNwrongParameters,"cvtStringToFontSet",XtCXtToolkitError,
              "String to FontSet conversion needs display and locale arguments",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
       return False;
     }
 
@@ -974,7 +974,7 @@ Boolean XtCvtStringToFontSet(
           XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
                  XtNmissingCharsetList,"cvtStringToFontSet",XtCXtToolkitError,
                  "Missing charsets in String to FontSet conversion",
-                 (String *) NULL, (Cardinal *)NULL);
+                 NULL, NULL);
             XFreeStringList(missing_charset_list);
       }
       if (f != NULL) {
@@ -1007,7 +1007,7 @@ Boolean XtCvtStringToFontSet(
 			 XtNmissingCharsetList,"cvtStringToFontSet",
 			 XtCXtToolkitError,
 			 "Missing charsets in String to FontSet conversion",
-                         (String *) NULL, (Cardinal *)NULL);
+                         NULL, NULL);
 		  XFreeStringList(missing_charset_list);
               }
               if (f != NULL)
@@ -1031,7 +1031,7 @@ Boolean XtCvtStringToFontSet(
       XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
              XtNmissingCharsetList,"cvtStringToFontSet",XtCXtToolkitError,
              "Missing charsets in String to FontSet conversion",
-             (String *) NULL, (Cardinal *)NULL);
+             NULL, NULL);
         XFreeStringList(missing_charset_list);
     }
     if (f != NULL)
@@ -1040,7 +1040,7 @@ Boolean XtCvtStringToFontSet(
     XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
            "noFont","cvtStringToFontSet",XtCXtToolkitError,
              "Unable to load any usable fontset",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
 
     return False;
 }
@@ -1058,7 +1058,7 @@ static void FreeFontSet(
       XtAppWarningMsg(app,
            XtNwrongParameters,"freeFontSet",XtCXtToolkitError,
              "FreeFontSet needs display and locale arguments",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
       return;
     }
 
@@ -1103,7 +1103,7 @@ XtCvtStringToFontStruct(
      XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	     XtNwrongParameters,"cvtStringToFontStruct",XtCXtToolkitError,
              "String to font conversion needs display argument",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
      return False;
     }
 
@@ -1157,7 +1157,7 @@ XtCvtStringToFontStruct(
     XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	     "noFont","cvtStringToFontStruct",XtCXtToolkitError,
              "Unable to load any usable ISO8859 font",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
 
     return False;
 }
@@ -1175,7 +1175,7 @@ static void FreeFontStruct(
      XtAppWarningMsg(app,
 	     XtNwrongParameters,"freeFontStruct",XtCXtToolkitError,
              "Free FontStruct requires display argument",
-              (String *) NULL, (Cardinal *)NULL);
+              NULL, NULL);
      return;
     }
 
@@ -1198,7 +1198,7 @@ Boolean XtCvtStringToInt(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToInt",XtCXtToolkitError,
                   "String to Integer conversion needs no extra arguments",
-                  (String *) NULL, (Cardinal *)NULL);
+                  NULL, NULL);
     if (IsInteger((String)fromVal->addr, &i))
 	donestr(int, i, XtRInt);
 
@@ -1221,7 +1221,7 @@ Boolean XtCvtStringToShort(
         XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	  XtNwrongParameters,"cvtStringToShort",XtCXtToolkitError,
           "String to Integer conversion needs no extra arguments",
-           (String *) NULL, (Cardinal *)NULL);
+           NULL, NULL);
     if (IsInteger((String)fromVal->addr, &i))
         donestr(short, (short)i, XtRShort);
 
@@ -1244,7 +1244,7 @@ Boolean XtCvtStringToDimension(
         XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	  XtNwrongParameters,"cvtStringToDimension",XtCXtToolkitError,
           "String to Dimension conversion needs no extra arguments",
-           (String *) NULL, (Cardinal *)NULL);
+           NULL, NULL);
     if (IsInteger((String)fromVal->addr, &i)) {
         if ( i < 0 )
             XtDisplayStringConversionWarning(dpy, (char*)fromVal->addr,
@@ -1268,7 +1268,7 @@ Boolean XtCvtIntToUnsignedChar(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToUnsignedChar",XtCXtToolkitError,
                   "Integer to UnsignedChar conversion needs no extra arguments",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(unsigned char, (*(int *)fromVal->addr));
 }
 
@@ -1288,7 +1288,7 @@ Boolean XtCvtStringToUnsignedChar(
         XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToUnsignedChar",XtCXtToolkitError,
                   "String to Integer conversion needs no extra arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     if (IsInteger((String)fromVal->addr, &i)) {
         if ( i < 0 || i > 255 )
             XtDisplayStringConversionWarning(dpy, (char*)fromVal->addr,
@@ -1314,7 +1314,7 @@ Boolean XtCvtColorToPixel(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtXColorToPixel",XtCXtToolkitError,
                   "Color to Pixel conversion needs no extra arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(Pixel, ((XColor *)fromVal->addr)->pixel);
 }
 
@@ -1331,7 +1331,7 @@ Boolean XtCvtIntToPixel(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToPixel",XtCXtToolkitError,
                   "Integer to Pixel conversion needs no extra arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(Pixel, *(int*)fromVal->addr);
 }
 
@@ -1348,7 +1348,7 @@ Boolean XtCvtIntToPixmap(
         XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtIntToPixmap",XtCXtToolkitError,
                   "Integer to Pixmap conversion needs no extra arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
     done(Pixmap, *(int*)fromVal->addr);
 }
 
@@ -1433,7 +1433,7 @@ XtCvtStringToInitialState(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToInitialState",XtCXtToolkitError,
                   "String to InitialState conversion needs no extra arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 
     if (CompareISOLatin1(str, "NormalState") == 0) donestr(int, NormalState, XtRInitialState);
     if (CompareISOLatin1(str, "IconicState") == 0) donestr(int, IconicState, XtRInitialState);
@@ -1468,7 +1468,7 @@ Boolean XtCvtStringToVisual(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToVisual",XtCXtToolkitError,
                   "String to Visual conversion needs screen and depth arguments",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 	return False;
     }
 
@@ -1519,7 +1519,7 @@ Boolean XtCvtStringToAtom(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		  XtNwrongParameters,"cvtStringToAtom",XtCXtToolkitError,
                   "String to Atom conversion needs Display argument",
-                   (String *) NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 	return False;
     }
 
@@ -1543,7 +1543,7 @@ Boolean XtCvtStringToDirectoryString(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
            XtNwrongParameters,"cvtStringToDirectoryString",XtCXtToolkitError,
            "String to DirectoryString conversion needs no extra arguments",
-           (String *)NULL, (Cardinal *)NULL);
+           NULL, NULL);
 
     str = (String)fromVal->addr;
     if (CompareISOLatin1(str, "XtCurrentDirectory") == 0) {
@@ -1584,7 +1584,7 @@ static void FreeDirectoryString(
 	XtAppWarningMsg(app,
 		 XtNwrongParameters,"freeDirectoryString",XtCXtToolkitError,
 		 "Free Directory String requires no extra arguments",
-                 (String *) NULL, (Cardinal *) NULL);
+                 NULL, NULL);
 
     XtFree((char *) toVal->addr);
 }
@@ -1603,7 +1603,7 @@ Boolean XtCvtStringToRestartStyle(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 	      XtNwrongParameters,"cvtStringToRestartStyle",XtCXtToolkitError,
               "String to RestartStyle conversion needs no extra arguments",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
 
     if (CompareISOLatin1(str, "RestartIfRunning") == 0)
 	donestr(unsigned char, SmRestartIfRunning, XtRRestartStyle);
@@ -1636,7 +1636,7 @@ Boolean XtCvtStringToCommandArgArray(
 	XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
             XtNwrongParameters,"cvtStringToCommandArgArray",XtCXtToolkitError,
             "String to CommandArgArray conversion needs no extra arguments",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
 
     src = fromVal->addr;
     dst = dst_str = __XtMalloc((unsigned) strlen(src) + 1);
@@ -1762,7 +1762,7 @@ Boolean XtCvtStringToGravity (
         XtAppWarningMsg(XtDisplayToApplicationContext (dpy),
 			"wrongParameters","cvtStringToGravity","XtToolkitError",
 			"String to Gravity conversion needs no extra arguments",
-			(String *) NULL, (Cardinal *)NULL);
+			NULL, NULL);
 	return False;
     }
     if (!haveQuarks) {
diff --git a/src/Core.c b/src/Core.c
index a808628..748ceaa 100644
--- a/src/Core.c
+++ b/src/Core.c
@@ -373,7 +373,7 @@ static Boolean CoreSetValues(
 	if (old->core.depth != new->core.depth) {
 	   XtAppWarningMsg(XtWidgetToApplicationContext(old),
 		    "invalidDepth","setValues",XtCXtToolkitError,
-               "Can't change widget depth", (String *)NULL, (Cardinal *)NULL);
+               "Can't change widget depth", NULL, NULL);
 	   new->core.depth = old->core.depth;
 	}
 	if (old->core.colormap != new->core.colormap) {
diff --git a/src/Create.c b/src/Create.c
index 81bf733..47ba2ca 100644
--- a/src/Create.c
+++ b/src/Create.c
@@ -640,12 +640,12 @@ _XtCreatePopupShell(
     if (parent == NULL) {
 	XtErrorMsg("invalidParent",XtNxtCreatePopupShell,XtCXtToolkitError,
 		"XtCreatePopupShell requires non-NULL parent",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
     } else if (widget_class == NULL) {
 	XtAppErrorMsg(XtWidgetToApplicationContext(parent),
 		"invalidClass",XtNxtCreatePopupShell,XtCXtToolkitError,
 		"XtCreatePopupShell requires non-NULL widget class",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
     }
     XtCheckSubclass(parent, coreWidgetClass, "in XtCreatePopupShell");
     default_screen = parent->core.screen;
@@ -697,7 +697,7 @@ _XtAppCreateShell(
 	XtAppErrorMsg(XtDisplayToApplicationContext(display),
 		"invalidClass","xtAppCreateShell",XtCXtToolkitError,
 		"XtAppCreateShell requires non-NULL widget class",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
     }
     if (name == NULL)
 	name = XrmNameToString(_XtGetPerDisplay(display)->name);
diff --git a/src/Display.c b/src/Display.c
index 3916bc3..669c8b4 100644
--- a/src/Display.c
+++ b/src/Display.c
@@ -329,7 +329,7 @@ _XtAppInit(
     if (fallback_resources) /* save a procedure call */
 	XtAppSetFallbackResources(*app_context_return, fallback_resources);
 
-    dpy = XtOpenDisplay(*app_context_return, (String) NULL, NULL,
+    dpy = XtOpenDisplay(*app_context_return, NULL, NULL,
 			application_class,
 			options, num_options, argc_in_out, *argv_in_out);
 
@@ -566,7 +566,7 @@ XtPerDisplay _XtSortPerDisplayList(Display *dpy)
 	if (pd == NULL) {
 	    XtErrorMsg(XtNnoPerDisplay, "getPerDisplay", XtCXtToolkitError,
 		    "Couldn't find per display information",
-		    (String *) NULL, (Cardinal *)NULL);
+		    NULL, NULL);
 	}
 
 	if (pd != _XtperDisplayList) {	/* move it to the front */
@@ -607,7 +607,7 @@ static void CloseDisplay(Display *dpy)
 	if (pd == NULL) {
 	    XtErrorMsg(XtNnoPerDisplay, "closeDisplay", XtCXtToolkitError,
 		    "Couldn't find per display information",
-		    (String *) NULL, (Cardinal *)NULL);
+		    NULL, NULL);
 	}
 
 	if (pd == _XtperDisplayList) _XtperDisplayList = pd->next;
diff --git a/src/Event.c b/src/Event.c
index 7fa20da..de52910 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1487,7 +1487,7 @@ void XtAddGrab(
 	XtAppWarningMsg(app,
 		"grabError", "xtAddGrab", XtCXtToolkitError,
 		"XtAddGrab requires exclusive grab if spring_loaded is TRUE",
-		(String *) NULL, (Cardinal *) NULL);
+		NULL, NULL);
 	exclusive = TRUE;
     }
 
@@ -1522,7 +1522,7 @@ void XtRemoveGrab(
 	    XtAppWarningMsg(app,
 		       "grabError","xtRemoveGrab",XtCXtToolkitError,
 		       "XtRemoveGrab asked to remove a widget not on the list",
-		       (String *)NULL, (Cardinal *)NULL);
+		       NULL, NULL);
 	    UNLOCK_PROCESS;
     	    UNLOCK_APP(app);
 	    return;
@@ -1672,7 +1672,7 @@ void XtRegisterExtensionSelector(
     if (dpy == NULL) XtErrorMsg("nullDisplay",
 		"xtRegisterExtensionSelector", XtCXtToolkitError,
 		"XtRegisterExtensionSelector requires a non-NULL display",
-		(String *) NULL, (Cardinal *) NULL);
+		NULL, NULL);
 
     LOCK_APP(app);
     LOCK_PROCESS;
@@ -1690,7 +1690,7 @@ void XtRegisterExtensionSelector(
 	    XtErrorMsg("rangeError", "xtRegisterExtensionSelector",
 		       XtCXtToolkitError,
 	"Attempt to register multiple selectors for one extension event type",
-		       (String *) NULL, (Cardinal *) NULL);
+		       NULL, NULL);
 	    UNLOCK_PROCESS;
 	    UNLOCK_APP(app);
 	    return;
diff --git a/src/Geometry.c b/src/Geometry.c
index 771094b..fdd5661 100644
--- a/src/Geometry.c
+++ b/src/Geometry.c
@@ -168,7 +168,7 @@ _XtMakeGeometryRequest (
 			  "invalidParent","xtMakeGeometryRequest",
 			  XtCXtToolkitError,
 			  "non-shell has no parent in XtMakeGeometryRequest",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 
 	managed = XtIsManaged(widget);
 	parentRealized = XtIsRealized(parent);
@@ -201,7 +201,7 @@ _XtMakeGeometryRequest (
 			  "invalidParent", "xtMakeGeometryRequest",
 			  XtCXtToolkitError,
 			  "XtMakeGeometryRequest - parent not composite",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 	}
 	else if (manager == (XtGeometryHandler) NULL)
 	{
@@ -209,7 +209,7 @@ _XtMakeGeometryRequest (
 			  "invalidGeometryManager","xtMakeGeometryRequest",
 			  XtCXtToolkitError,
 			  "XtMakeGeometryRequest - parent has no geometry manager",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 	}
     }
 #else
@@ -724,7 +724,7 @@ void XtTranslateCoords(
         XtAppWarningMsg(app,
 		"invalidShell","xtTranslateCoords",XtCXtToolkitError,
                 "Widget has no shell ancestor",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
     else {
 	Position x2, y2;
 	_XtShellGetCoordinates( w, &x2, &y2 );
diff --git a/src/GetValues.c b/src/GetValues.c
index 511b8d8..c836366 100644
--- a/src/GetValues.c
+++ b/src/GetValues.c
@@ -209,7 +209,7 @@ void XtGetValues(
 	XtAppErrorMsg(app,
 		"invalidArgCount","xtGetValues",XtCXtToolkitError,
             "Argument count > 0 on NULL argument list in XtGetValues",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
     }
 
     LOCK_APP(app);
diff --git a/src/Hooks.c b/src/Hooks.c
index 9c05a05..64e8355 100644
--- a/src/Hooks.c
+++ b/src/Hooks.c
@@ -80,7 +80,7 @@ void XtRemoveBlockHook(
 #ifdef DEBUG
 	XtAppWarningMsg(app, "badId", "xtRemoveBlockHook", XtCXtToolkitError,
 			"XtRemoveBlockHook called with bad or old hook id",
-			(String*)NULL, (Cardinal*)NULL);
+			NULL, NULL);
 #endif /*DEBUG*/
 	UNLOCK_APP(app);
 	return;
diff --git a/src/Initialize.c b/src/Initialize.c
index 0218849..acfeaec 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -268,7 +268,7 @@ void _XtInherit(void)
 {
     XtErrorMsg("invalidProcedure","inheritanceProc",XtCXtToolkitError,
             "Unresolved inheritance operation",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
 }
 
 
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index 35d1c2f..cd70b15 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -310,7 +310,7 @@ static void RealizeWidget(
 	XtAppErrorMsg(XtWidgetToApplicationContext(widget),
 		      "invalidProcedure","realizeProc",XtCXtToolkitError,
 		      "No realize class procedure defined",
-		      (String *)NULL, (Cardinal *)NULL);
+		      NULL, NULL);
     else {
 	CALLGEOTAT(_XtGeoTrace(widget,"Call \"%s\"[%d,%d]'s realize proc\n",
 		       XtName(widget),
diff --git a/src/Manage.c b/src/Manage.c
index f97ec2a..f51ca59 100644
--- a/src/Manage.c
+++ b/src/Manage.c
@@ -103,7 +103,7 @@ static void UnmanageChildren(
         XtAppErrorMsg(XtWidgetToApplicationContext((Widget)parent),
 		      "invalidParent",caller_func, XtCXtToolkitError,
 		   "Attempt to unmanage a child when parent is not Composite",
-		      (String *) NULL, (Cardinal *) NULL);
+		      NULL, NULL);
     }
 
     for (i = 0; i < num_children; i++) {
@@ -112,14 +112,14 @@ static void UnmanageChildren(
 	    XtAppWarningMsg(XtWidgetToApplicationContext(parent),
 		  XtNinvalidChild,caller_func,XtCXtToolkitError,
                   "Null child passed to XtUnmanageChildren",
-		  (String *)NULL, (Cardinal *)NULL);
+		  NULL, NULL);
 	    return;
 	}
         if (child->core.parent != parent) {
 	   XtAppWarningMsg(XtWidgetToApplicationContext(parent),
 		   "ambiguousParent",caller_func,XtCXtToolkitError,
            "Not all children have same parent in UnmanageChildren",
-             (String *)NULL, (Cardinal *)NULL);
+             NULL, NULL);
 	} else
         if (child->core.managed) {
             (*num_unique_children)++;
@@ -169,7 +169,7 @@ void XtUnmanageChildren (
     if (children[0] == NULL) {
 	XtWarningMsg(XtNinvalidChild,XtNxtUnmanageChildren,XtCXtToolkitError,
 		     "Null child found in argument list to unmanage",
-		     (String *)NULL, (Cardinal *)NULL);
+		     NULL, NULL);
 	return;
     }
 #ifdef XTHREADS
@@ -230,7 +230,7 @@ static void ManageChildren(
 	XtAppErrorMsg(XtWidgetToApplicationContext((Widget)parent),
 		"invalidParent",caller_func, XtCXtToolkitError,
 	    "Attempt to manage a child when parent is not Composite",
-	    (String *) NULL, (Cardinal *) NULL);
+	    NULL, NULL);
     }
 
     /* Construct new list of children that really need to be operated upon. */
@@ -246,7 +246,7 @@ static void ManageChildren(
 	    XtAppWarningMsg(XtWidgetToApplicationContext((Widget)parent),
 		XtNinvalidChild,caller_func,XtCXtToolkitError,
 		"null child passed to ManageChildren",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
 	    if (unique_children != cache) XtFree((char *) unique_children);
 	    return;
 	}
@@ -267,7 +267,7 @@ static void ManageChildren(
 	    XtAppWarningMsg(XtWidgetToApplicationContext((Widget)parent),
 		    "ambiguousParent",caller_func,XtCXtToolkitError,
 		"Not all children have same parent in XtManageChildren",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
 	} else if (! child->core.managed && !child->core.being_destroyed) {
 	    unique_children[num_unique_children++] = child;
 	    CALLGEOTAT(_XtGeoTrace(child,
@@ -325,7 +325,7 @@ void XtManageChildren(
     if (children[0] == NULL) {
 	XtWarningMsg(XtNinvalidChild, XtNxtManageChildren, XtCXtToolkitError,
 		     "null child passed to XtManageChildren",
-		     (String*)NULL, (Cardinal*)NULL);
+		     NULL, NULL);
 	return;
     }
 #ifdef XTHREADS
@@ -439,14 +439,14 @@ void XtChangeManagedSet(
     if (call_out || i >= 0) {
 	XtAppWarningMsg(app, "ambiguousParent", XtNxtChangeManagedSet,
 			XtCXtToolkitError, "Not all children have same parent",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
     }
     if (! XtIsComposite(parent)) {
 	UNLOCK_APP(app);
 	XtAppErrorMsg(app, "invalidParent", XtNxtChangeManagedSet,
 		      XtCXtToolkitError,
 		      "Attempt to manage a child when parent is not Composite",
-		      (String *) NULL, (Cardinal *) NULL);
+		      NULL, NULL);
     }
     if (parent->core.being_destroyed) {
 	UNLOCK_APP(app);
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 68c2e88..824429c 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -995,7 +995,7 @@ XtInputId XtAppAddInput(
 	    condition & (unsigned long)(~(XtInputReadMask|XtInputWriteMask|XtInputExceptMask)))
 	    XtAppErrorMsg(app,"invalidParameter","xtAddInput",XtCXtToolkitError,
 			  "invalid condition passed to XtAppAddInput",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 
 	if (app->input_max <= source) {
 	    Cardinal n = (Cardinal) (source + 1);
@@ -1095,7 +1095,7 @@ void XtRemoveInput(
 	    XtAppWarningMsg(app, "invalidProcedure","inputHandler",
 			    XtCXtToolkitError,
 			    "XtRemoveInput: Input handler not found",
-			    (String *)NULL, (Cardinal *)NULL);
+			    NULL, NULL);
 	UNLOCK_APP(app);
 }
 
diff --git a/src/PassivGrab.c b/src/PassivGrab.c
index f8a10ad..42907d9 100644
--- a/src/PassivGrab.c
+++ b/src/PassivGrab.c
@@ -797,7 +797,7 @@ void   UngrabKeyOrButton (
 	  XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		       "invalidGrab", "ungrabKeyOrButton", XtCXtToolkitError,
 		       "Attempt to remove nonexistent passive grab",
-		       (String *)NULL, (Cardinal *)NULL);
+		       NULL, NULL);
 	  return;
       }
 
diff --git a/src/Popup.c b/src/Popup.c
index 3f4554b..acf3633 100644
--- a/src/Popup.c
+++ b/src/Popup.c
@@ -62,7 +62,7 @@ void _XtPopup(
 	XtAppErrorMsg(XtWidgetToApplicationContext(widget),
 		"invalidClass","xtPopup",XtCXtToolkitError,
                 "XtPopup requires a subclass of shellWidgetClass",
-                  (String *)NULL, (Cardinal *)NULL);
+                  NULL, NULL);
     }
 
     if (! shell_widget->shell.popped_up) {
@@ -102,7 +102,7 @@ void XtPopup (Widget widget, XtGrabKind grab_kind)
 		XtWidgetToApplicationContext(widget),
 		"invalidGrabKind","xtPopup",XtCXtToolkitError,
 		"grab kind argument has invalid value; XtGrabNone assumed",
-		(String *)NULL, (Cardinal *)NULL);
+		NULL, NULL);
 	grab_kind = XtGrabNone;
     }
 
@@ -152,7 +152,7 @@ void XtPopdown(
 	XtAppErrorMsg(XtWidgetToApplicationContext(widget),
 		"invalidClass","xtPopdown",XtCXtToolkitError,
             "XtPopdown requires a subclass of shellWidgetClass",
-              (String *)NULL, (Cardinal *)NULL);
+              NULL, NULL);
     }
 
 #ifndef X_NO_XT_POPDOWN_CONFORMANCE
diff --git a/src/Resources.c b/src/Resources.c
index 4eef3fd..50d30fb 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -96,7 +96,7 @@ void _XtCopyFromParent(
 	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		"invalidParent","xtCopyFromParent",XtCXtToolkitError,
                   "CopyFromParent must have non-NULL parent",
-		  (String *)NULL, (Cardinal *)NULL);
+		  NULL, NULL);
         value->addr = NULL;
         return;
     }
@@ -173,7 +173,7 @@ void _XtCopyToArg(
 	    (void) memmove((char*)dst, (char*)src, (size_t)size );
 #else
 	XtErrorMsg("invalidGetValues", "xtGetValues", XtCXtToolkitError,
-	    "NULL ArgVal in XtGetValues", (String*) NULL, (Cardinal*) NULL);
+	    "NULL ArgVal in XtGetValues", NULL, NULL);
 #endif
     }
     else {
@@ -499,7 +499,7 @@ static XtCacheRef *GetResources(
     	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		"invalidArgCount","getResources",XtCXtToolkitError,
                  "argument count > 0 on NULL argument list",
-                   (String *)NULL, (Cardinal *)NULL);
+                   NULL, NULL);
 	num_args = 0;
     }
     if (num_resources == 0) {
@@ -508,13 +508,13 @@ static XtCacheRef *GetResources(
     	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		"invalidResourceCount","getResources",XtCXtToolkitError,
               "too many resources",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	return NULL;
     } else if (table == NULL) {
     	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		"invalidResourceCount","getResources",XtCXtToolkitError,
               "resource count > 0 on NULL resource list",
-	      (String *)NULL, (Cardinal *)NULL);
+	      NULL, NULL);
 	return NULL;
     }
 
@@ -1145,7 +1145,7 @@ void _XtResourceListInitialize(void)
     if (initialized) {
 	XtWarningMsg("initializationError","xtInitialize",XtCXtToolkitError,
                   "Initializing Resource Lists twice",
-		  (String *)NULL, (Cardinal *)NULL);
+		  NULL, NULL);
 	UNLOCK_PROCESS;
     	return;
     }
diff --git a/src/Selection.c b/src/Selection.c
index 97f8232..9af6b08 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -246,7 +246,7 @@ static void FreeSelectionProperty(
     XtAppErrorMsg(XtDisplayToApplicationContext(dpy),
 	    "noSelectionProperties", "freeSelectionProperty", XtCXtToolkitError,
 		"internal error: no selection property context for display",
-		 (String *)NULL,  (Cardinal *)NULL );
+		 NULL,  NULL );
  UNLOCK_PROCESS;
  for (p = sarray->list, propCount=sarray->propCount;
 	propCount;
@@ -1268,7 +1268,7 @@ static unsigned long IncrPropSize(
 	XtAppWarningMsg( XtWidgetToApplicationContext(widget),
 			"badFormat","xtGetSelectionValue",XtCXtToolkitError,
 	"Selection owner returned type INCR property with format != 32",
-			(String*)NULL, (Cardinal*)NULL );
+			NULL, NULL );
 	return 0;
     }
 }
diff --git a/src/SetValues.c b/src/SetValues.c
index d057e94..8108576 100644
--- a/src/SetValues.c
+++ b/src/SetValues.c
@@ -158,7 +158,7 @@ CallConstraintSetValues (
 	    XtAppErrorMsg(XtWidgetToApplicationContext(current),
 		    "invalidClass","constraintSetValue",XtCXtToolkitError,
                  "Subclass of Constraint required in CallConstraintSetValues",
-                  (String *)NULL, (Cardinal *)NULL);
+                  NULL, NULL);
 	LOCK_PROCESS;
 	superclass = (ConstraintWidgetClass) class->core_class.superclass;
 	UNLOCK_PROCESS;
@@ -214,7 +214,7 @@ void XtSetValues(
         XtAppErrorMsg(app,
 		"invalidArgCount","xtSetValues",XtCXtToolkitError,
                 "Argument count > 0 on NULL argument list in XtSetValues",
-                 (String *)NULL, (Cardinal *)NULL);
+                 NULL, NULL);
     }
 
     /* Allocate and copy current widget into old widget */
@@ -383,7 +383,7 @@ void XtSetValues(
 			    "invalidProcedure","set_values_almost",
 			  XtCXtToolkitError,
 			  "set_values_almost procedure shouldn't be NULL",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 		    break;
 		}
 		if (result == XtGeometryNo) geoReply.request_mode = 0;
diff --git a/src/Shell.c b/src/Shell.c
index 5112f02..664eedb 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -1555,7 +1555,7 @@ static void EventHandler(
 		XtAppErrorMsg(XtWidgetToApplicationContext(wid),
 			"invalidWindow","eventHandler",XtCXtToolkitError,
                         "Event with wrong window",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
 		return;
 	}
 
@@ -2209,7 +2209,7 @@ static XtGeometryResult RootGeometryManager(
 	} else XtAppWarningMsg(XtWidgetToApplicationContext((Widget)w),
 			       "internalError", "shell", XtCXtToolkitError,
 			       "Shell's window manager interaction is broken",
-			       (String *)NULL, (Cardinal *)NULL);
+			       NULL, NULL);
     } else if (wm) { /* no event */
 	((WMShellWidget)w)->wm.wait_for_wm = FALSE; /* timed out; must be broken */
     }
@@ -2722,7 +2722,7 @@ static void ApplicationShellInsertChild(
 	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 	       "invalidClass", "applicationShellInsertChild", XtCXtToolkitError,
 	       "ApplicationShell does not accept RectObj children; ignored",
-	       (String*)NULL, (Cardinal*)NULL);
+	       NULL, NULL);
     }
     else {
 	XtWidgetProc insert_child;
@@ -3386,7 +3386,7 @@ static String* EditCommand(
 	*s = str;		s++;
 	for (; --count > 0; s++, sarray++)
 	    *s = *sarray;
-	*s = (String) NULL;
+	*s = NULL;
     } else {
 	if (count < 3)
 	    return NewStringArray(sarray);
@@ -3400,7 +3400,7 @@ static String* EditCommand(
 		s++;
 	    }
 	}
-	*s = (String) NULL;
+	*s = NULL;
     }
     s = new;
     new = NewStringArray(new);
diff --git a/src/TMaction.c b/src/TMaction.c
index 37e3ef1..c9066b9 100644
--- a/src/TMaction.c
+++ b/src/TMaction.c
@@ -553,7 +553,7 @@ static void RemoveAccelerators(
         XtAppWarningMsg(XtWidgetToApplicationContext(widget),
             XtNtranslationError,"nullTable",XtCXtToolkitError,
             "Can't remove accelerators from NULL table",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
         return;
     }
 
@@ -581,7 +581,7 @@ static void RemoveAccelerators(
       XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 		      XtNtranslationError,"nullTable",XtCXtToolkitError,
 		      "Tried to remove nonexistent accelerators",
-		      (String *)NULL, (Cardinal *)NULL);
+		      NULL, NULL);
     else {
 	if (!destination->core.being_destroyed)
 	  for (i = 0; i < numXlations; i++)
@@ -855,7 +855,7 @@ void XtMenuPopupAction(
 	XtAppWarningMsg(app,
 		      "invalidParameters","xtMenuPopupAction",XtCXtToolkitError,
 			"MenuPopup wants exactly one argument",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -868,7 +868,7 @@ void XtMenuPopupAction(
 	XtAppWarningMsg(app,
 		"invalidPopup","unsupportedOperation",XtCXtToolkitError,
 "Pop-up menu creation is only supported on ButtonPress, KeyPress or EnterNotify events.",
-                  (String *)NULL, (Cardinal *)NULL);
+                  NULL, NULL);
 	UNLOCK_APP(app);
 	return;
     }
@@ -914,7 +914,7 @@ static void _XtMenuPopdownAction(
 	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 			"invalidParameters","xtMenuPopdown",XtCXtToolkitError,
 			"XtMenuPopdown called with num_params != 0 or 1",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
     }
 }
 
diff --git a/src/TMgrab.c b/src/TMgrab.c
index 25c5540..551cc51 100644
--- a/src/TMgrab.c
+++ b/src/TMgrab.c
@@ -231,7 +231,7 @@ static Boolean DoGrab(
 	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
 			"invalidPopup","unsupportedOperation",XtCXtToolkitError,
 			"Pop-up menu creation is only supported on Button, Key or EnterNotify events.",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
 	break;
     }
     UNLOCK_PROCESS;
diff --git a/src/TMkey.c b/src/TMkey.c
index 353bf98..6071658 100644
--- a/src/TMkey.c
+++ b/src/TMkey.c
@@ -185,7 +185,7 @@ Boolean _XtComputeLateBindings(
         XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
 		"displayError","invalidDisplay",XtCXtToolkitError,
             "Can't find display structure",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
          return FALSE;
     }
     _InitializeKeysymTables(dpy, perDisplay);
diff --git a/src/TMstate.c b/src/TMstate.c
index 443eb09..87f6749 100644
--- a/src/TMstate.c
+++ b/src/TMstate.c
@@ -1093,7 +1093,7 @@ void _XtTranslateEvent (
         XtAppWarningMsg(XtWidgetToApplicationContext(w),
 			XtNtranslationError,"nullTable",XtCXtToolkitError,
 			"Can't translate event through NULL table",
-			(String *)NULL, (Cardinal *)NULL);
+			NULL, NULL);
 	return ;
     }
     if (current_state == NULL)
@@ -1535,7 +1535,7 @@ static void AmbigActions(
     XtWarningMsg (XtNtranslationError,"ambiguousActions",
 		  XtCXtToolkitError,
 		  "Overriding earlier translation manager actions.",
-		  (String *)NULL, (Cardinal *)NULL);
+		  NULL, NULL);
 
     FreeActions((*state)->actions);
     (*state)->actions = NULL;
@@ -1659,7 +1659,7 @@ Boolean _XtCvtMergeTranslations(
     if (*num_args != 0)
 	XtWarningMsg("invalidParameters","mergeTranslations",XtCXtToolkitError,
              "MergeTM to TranslationTable needs no extra arguments",
-               (String *)NULL, (Cardinal *)NULL);
+               NULL, NULL);
 
     if (to->addr != NULL && to->size < sizeof(XtTranslations)) {
 	to->size = sizeof(XtTranslations);
@@ -1961,7 +1961,7 @@ static Boolean ComposeTranslations(
 	  XtAppWarningMsg(XtWidgetToApplicationContext(dest),
 			  XtNtranslationError,"nullTable",XtCXtToolkitError,
 			  "table to (un)merge must not be null",
-			  (String *)NULL, (Cardinal *)NULL);
+			  NULL, NULL);
 	  return False;
       }
 
@@ -2193,7 +2193,7 @@ void _XtFreeTranslations(
 	XtAppWarningMsg(app,
 	  "invalidParameters","freeTranslations",XtCXtToolkitError,
           "Freeing XtTranslations requires no extra arguments",
-	  (String *)NULL, (Cardinal *)NULL);
+	  NULL, NULL);
 
     xlations = *(XtTranslations*)toVal->addr;
     for (i = 0; i < (int)xlations->numStateTrees; i++)
diff --git a/src/VarGet.c b/src/VarGet.c
index ccd4d10..ce66e6f 100644
--- a/src/VarGet.c
+++ b/src/VarGet.c
@@ -149,7 +149,7 @@ GetTypedArg(
 	XtAppWarningMsg(XtWidgetToApplicationContext(widget),
             "unknownType", XtNxtGetTypedArg, XtCXtToolkitError,
             "Unable to find type of resource for conversion",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
  	return;
     }
 
diff --git a/src/Varargs.c b/src/Varargs.c
index 10c1361..0e1900b 100644
--- a/src/Varargs.c
+++ b/src/Varargs.c
@@ -185,7 +185,7 @@ TypedArgToArg(
         XtAppWarningMsg(XtWidgetToApplicationContext(widget),
             "nullWidget", XtNxtConvertVarToArgList, XtCXtToolkitError,
 	    "XtVaTypedArg conversion needs non-NULL widget handle",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
         return(0);
     }
 
@@ -201,7 +201,7 @@ TypedArgToArg(
         XtAppWarningMsg(XtWidgetToApplicationContext(widget),
             "unknownType", XtNxtConvertVarToArgList, XtCXtToolkitError,
             "Unable to find type of resource for conversion",
-            (String *)NULL, (Cardinal *)NULL);
+            NULL, NULL);
         return(0);
     }
 
@@ -221,7 +221,7 @@ TypedArgToArg(
 	UNLOCK_PROCESS;
         XtAppWarningMsg(XtWidgetToApplicationContext(widget),
             "conversionFailed", XtNxtConvertVarToArgList, XtCXtToolkitError,
-            "Type conversion failed", (String *)NULL, (Cardinal *)NULL);
+            "Type conversion failed", NULL, NULL);
         return(0);
     }