Convert XmuSnprintf calls to just plain snprintf

All supported platforms have native snprintf

Remove #include <X11/Xmu/SysUtil.h> since it only defines XmuSnprintf
and the unused XmuGethostname

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

13 files changed, 107 insertions, 116 deletions

diff --git a/src/Actions.c b/src/Actions.c
index 987c7bd..3a444b8 100644
--- a/src/Actions.c
+++ b/src/Actions.c
@@ -38,7 +38,6 @@
 #include <X11/CoreP.h>
 #include <X11/Constraint.h>
 #include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xfuncs.h>
 #include "Private.h"
 
@@ -300,8 +299,8 @@ get_token(XawEvalInfo *info)
   {
     char msg[256];
 
-    XmuSnprintf(msg, sizeof(msg),
-		"evaluate(): bad token \"%c\" at \"%s\"", ch, info->cp - 1);
+    snprintf(msg, sizeof(msg), "evaluate(): bad token \"%c\" at \"%s\"",
+	     ch, info->cp - 1);
 
     XtAppWarning(XtWidgetToApplicationContext(info->widget), msg);
   }
@@ -371,8 +370,8 @@ prim(XawEvalInfo *info)
 	  char msg[256];
 
 	  info->token = ERROR;
-	  XmuSnprintf(msg, sizeof(msg),
-		      "evaluate(): expecting ), at \"%s\"", info->lp);
+	  snprintf(msg, sizeof(msg), "evaluate(): expecting ), at \"%s\"",
+		   info->lp);
 	  XtAppWarning(XtWidgetToApplicationContext(info->widget), msg);
 	  return (False);
 	}
@@ -385,8 +384,8 @@ prim(XawEvalInfo *info)
 	char msg[256];
 
 	info->token = ERROR;
-	XmuSnprintf(msg, sizeof(msg),
-		    "evaluate(): syntax error, at \"%s\"", info->lp);
+	snprintf(msg, sizeof(msg), "evaluate(): syntax error, at \"%s\"",
+		 info->lp);
 	XtAppWarning(XtWidgetToApplicationContext(info->widget), msg);
       } return (False);
     }
@@ -435,8 +434,7 @@ XawSetValuesAction(Widget w, XEvent *event,
 	{
 	  char msg[256];
 
-	  XmuSnprintf(msg, sizeof(msg),
-		      "set-values(): bad resource name \"%s\"",
+	  snprintf(msg, sizeof(msg), "set-values(): bad resource name \"%s\"",
 		   params[count]);
 	  XtAppWarning(XtWidgetToApplicationContext(w), msg);
           continue;
@@ -457,9 +455,9 @@ XawSetValuesAction(Widget w, XEvent *event,
 	  {
 	    char msg[256];
 
-	    XmuSnprintf(msg, sizeof(msg),
-			"set-values(): bad resource size for \"%s\"",
-			params[count]);
+	    snprintf(msg, sizeof(msg),
+		     "set-values(): bad resource size for \"%s\"",
+		     params[count]);
 	    XtAppWarning(XtWidgetToApplicationContext(w), msg);
 	  } continue;
 	}
@@ -594,8 +592,8 @@ XawConvertActionRes(XawActionResList *list, Widget w, String name)
     {
       char msg[256];
 
-      XmuSnprintf(msg, sizeof(msg),
-		  "convert(): bad resource name \"%s\"", name);
+      snprintf(msg, sizeof(msg), "convert(): bad resource name \"%s\"",
+	       name);
       XtAppWarning(XtWidgetToApplicationContext(w), msg);
       return (NULL);
     }
@@ -625,8 +623,8 @@ XawConvertActionRes(XawActionResList *list, Widget w, String name)
       {
         char msg[256];
 
-        XmuSnprintf(msg, sizeof(msg),
-		    "convert(): bad resource size for \"%s\"", name);
+        snprintf(msg, sizeof(msg), "convert(): bad resource size for \"%s\"",
+		 name);
 	XtAppWarning(XtWidgetToApplicationContext(w), name);
       } return (NULL);
     }
@@ -651,17 +649,17 @@ XawPrintActionErrorMsg(String action_name, Widget w,
   char msg[1024];
   unsigned int size, idx;
 
-  size = XmuSnprintf(msg, sizeof(msg), "%s(): bad number of parameters.\n\t(",
-		     action_name);
+  size = snprintf(msg, sizeof(msg), "%s(): bad number of parameters.\n\t(",
+		  action_name);
 
   idx = 0;
   while (idx < *num_params - 1 && size < sizeof(msg))
-    size += XmuSnprintf(&msg[size], sizeof(msg) - size, "%s, ",
-			params[idx++]);
+    size += snprintf(&msg[size], sizeof(msg) - size, "%s, ",
+		     params[idx++]);
   if (*num_params)
-    XmuSnprintf(&msg[size], sizeof(msg) - size, "%s)", params[idx]);
+    snprintf(&msg[size], sizeof(msg) - size, "%s)", params[idx]);
   else
-    XmuSnprintf(&msg[size], sizeof(msg) - size, ")");
+    snprintf(&msg[size], sizeof(msg) - size, ")");
   XtAppWarning(XtWidgetToApplicationContext(w), msg);
 }
 
@@ -904,8 +902,9 @@ XawDeclareActionVar(XawActionVarList *list, String name, String value)
     {
       char msg[256];
 
-      XmuSnprintf(msg, sizeof(msg), "declare(): variable name must begin with "
-		  "\'%c\', at %s = %s", XAW_PRIV_VAR_PREFIX, name, value);
+      snprintf(msg, sizeof(msg),
+	       "declare(): variable name must begin with \'%c\', at %s = %s",
+	       XAW_PRIV_VAR_PREFIX, name, value);
       XtAppWarning(XtWidgetToApplicationContext(list->widget), msg);
       return;
     }
diff --git a/src/Converters.c b/src/Converters.c
index 090488e..9795671 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -32,7 +32,6 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/Simple.h>
 #include <X11/Xaw/XawInit.h>
 #include "Private.h"
@@ -217,7 +216,7 @@ XawTypeToStringWarning(Display *dpy, String type)
   String params[1];
   Cardinal num_params;
 
-  XmuSnprintf(fname, sizeof(fname), "cvt%sToString", type);
+  snprintf(fname, sizeof(fname), "cvt%sToString", type);
 
   params[0] = type;
   num_params = 1;
@@ -235,7 +234,7 @@ TypeToStringNoArgsWarning(Display *dpy, String type)
   String params[1];
   Cardinal num_params;
 
-  XmuSnprintf(fname, sizeof(fname), "cvt%sToString", type);
+  snprintf(fname, sizeof(fname), "cvt%sToString", type);
 
   params[0] = type;
   num_params = 1;
@@ -258,8 +257,8 @@ _XawCvtBooleanToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRBoolean);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%s",
-	      *(Boolean *)fromVal->addr ? XtEtrue : XtEfalse);
+  snprintf(buffer, sizeof(buffer), "%s",
+	   *(Boolean *)fromVal->addr ? XtEtrue : XtEfalse);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -277,8 +276,8 @@ _XawCvtBoolToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRBool);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%s",
-	      *(Bool *)fromVal->addr ? XtEtrue : XtEfalse);
+  snprintf(buffer, sizeof(buffer), "%s",
+	   *(Bool *)fromVal->addr ? XtEtrue : XtEfalse);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -296,7 +295,7 @@ _XawCvtPositionToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRPosition);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%d", *(Position *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%d", *(Position *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -314,7 +313,7 @@ _XawCvtShortToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRShort);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%d", *(short *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%d", *(short *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -332,7 +331,7 @@ _XawCvtDimensionToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRDimension);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%u", *(Dimension *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%u", *(Dimension *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -350,7 +349,7 @@ _XawCvtCARD32ToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, "CARD32");
 
-  XmuSnprintf(buffer, sizeof(buffer), "0x%08hx", *(int *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "0x%08hx", *(int *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -368,7 +367,7 @@ _XawCvtIntToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRInt);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%d", *(int *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%d", *(int *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -386,7 +385,7 @@ _XawCvtCardinalToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRCardinal);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%u", *(Cardinal *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%u", *(Cardinal *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -454,8 +453,8 @@ _XawCvtPixelToString(Display *dpy, XrmValue *args, Cardinal *num_args,
    * without asking Xlib.
    */
   XQueryColor(dpy, colormap, &color);
-  XmuSnprintf(buffer, sizeof(buffer), "rgb:%04hx/%04hx/%04hx",
-	      color.red, color.green, color.blue);
+  snprintf(buffer, sizeof(buffer), "rgb:%04hx/%04hx/%04hx",
+	   color.red, color.green, color.blue);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
@@ -486,7 +485,7 @@ _XawCvtFontStructToString(Display *dpy, XrmValue *args, Cardinal *num_args,
 
       if (tmp)
 	{
-	  XmuSnprintf(buffer, sizeof(buffer), "%s", tmp);
+	  snprintf(buffer, sizeof(buffer), "%s", tmp);
 	  size = strlen(tmp);
 	  XFree(tmp);
 	}
@@ -515,8 +514,8 @@ _XawCvtUnsignedCharToString(Display *dpy, XrmValue *args, Cardinal *num_args,
   if (*num_args != 0)
     TypeToStringNoArgsWarning(dpy, XtRUnsignedChar);
 
-  XmuSnprintf(buffer, sizeof(buffer), "%u",
-	      *(unsigned char *)fromVal->addr);
+  snprintf(buffer, sizeof(buffer), "%u",
+	   *(unsigned char *)fromVal->addr);
   size = strlen(buffer) + 1;
 
   string_done(buffer);
diff --git a/src/DisplayList.c b/src/DisplayList.c
index 2b6e247..4ef89aa 100644
--- a/src/DisplayList.c
+++ b/src/DisplayList.c
@@ -39,7 +39,6 @@
 #include <X11/CoreP.h>
 #include <X11/Xfuncs.h>
 #include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/SysUtil.h>
 #include "Private.h"
 
 #ifdef __UNIXOS2__
@@ -273,8 +272,8 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
 	{
 	  char msg[256];
 
-	  XmuSnprintf(msg, sizeof(msg),
-		      "Error parsing displayList at \"%s\"", lp);
+	  snprintf(msg, sizeof(msg),
+		   "Error parsing displayList at \"%s\"", lp);
 	  XtAppWarning(XtDisplayToApplicationContext(DisplayOfScreen(screen)),
 		       msg);
 	  XawDestroyDisplayList(dlist);
@@ -291,15 +290,15 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
 	}
       if (fp)
 	{
-	  XmuSnprintf(cname, fp - fname + 1, fname);
+	  snprintf(cname, fp - fname + 1, fname);
 	  memmove(fname, fp + 1, strlen(fp));
 	  lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
 	  if (!lc)
 	    {
 	      char msg[256];
 
-	      XmuSnprintf(msg, sizeof(msg),
-			  "Cannot find displayList class \"%s\"", cname);
+	      snprintf(msg, sizeof(msg),
+		       "Cannot find displayList class \"%s\"", cname);
 	      XtAppWarning(XtDisplayToApplicationContext
 			   (DisplayOfScreen(screen)), msg);
 	      XawDestroyDisplayList(dlist);
@@ -316,8 +315,8 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
 	{
 	  char msg[256];
 
-	  XmuSnprintf(msg, sizeof(msg),
-		      "Cannot find displayList procedure \"%s\"", fname);
+	  snprintf(msg, sizeof(msg),
+		   "Cannot find displayList procedure \"%s\"", fname);
 	  XtAppWarning(XtDisplayToApplicationContext(DisplayOfScreen(screen)),
 		       msg);
 	  XawDestroyDisplayList(dlist);
@@ -355,8 +354,8 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
 	    {
 	      char msg[256];
 
-	      XmuSnprintf(msg, sizeof(msg),
-			  "Error parsing displayList at \"%s\"", lp);
+	      snprintf(msg, sizeof(msg),
+		       "Error parsing displayList at \"%s\"", lp);
 	      XtAppWarning(XtDisplayToApplicationContext
 			   (DisplayOfScreen(screen)), msg);
 	      XawDestroyDisplayList(dlist);
@@ -420,8 +419,9 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
 	      char msg[256];
 
 	      proc->args = NULL;
-	      XmuSnprintf(msg, sizeof(msg),
-			  "Cannot convert arguments to displayList function \"%s\"", fname);
+	      snprintf(msg, sizeof(msg),
+		       "Cannot convert arguments to displayList function \"%s\"",
+		       fname);
 	      XtAppWarning(XtDisplayToApplicationContext
 			   (DisplayOfScreen(screen)), msg);
 	      XawDestroyDisplayList(dlist);
diff --git a/src/MenuButton.c b/src/MenuButton.c
index 64c95a2..e190851 100644
--- a/src/MenuButton.c
+++ b/src/MenuButton.c
@@ -42,7 +42,6 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/MenuButtoP.h>
 #include <X11/Xaw/XawInit.h>
 #include "Private.h"
@@ -221,9 +220,9 @@ PopupMenu(Widget w, XEvent *event, String *params, Cardinal *num_params)
     if (menu == NULL) {
 	char error_buf[BUFSIZ];
 
-	(void)XmuSnprintf(error_buf, sizeof(error_buf),
-			  "MenuButton:  Could not find menu widget named %s.",
-			  mbw->menu_button.menu_name);
+	snprintf(error_buf, sizeof(error_buf),
+		 "MenuButton:  Could not find menu widget named %s.",
+		 mbw->menu_button.menu_name);
 	XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
 	return;
     }
diff --git a/src/Paned.c b/src/Paned.c
index f0eadd6..26ff812 100644
--- a/src/Paned.c
+++ b/src/Paned.c
@@ -64,7 +64,6 @@ SOFTWARE.
 #include <X11/Xmu/CharSet.h>
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Misc.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/Grip.h>
 #include <X11/Xaw/PanedP.h>
 #include <X11/Xaw/XawImP.h>
diff --git a/src/Simple.c b/src/Simple.c
index 86b3ace..be5597b 100644
--- a/src/Simple.c
+++ b/src/Simple.c
@@ -52,7 +52,6 @@ SOFTWARE.
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/Drawing.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/SimpleP.h>
 #include <X11/Xaw/XawInit.h>
 #include "Private.h"
@@ -271,11 +270,11 @@ XawSimpleClassPartInitialize(WidgetClass cclass)
     if (c->simple_class.change_sensitive == NULL) {
 	char buf[BUFSIZ];
 
-	(void)XmuSnprintf(buf, sizeof(buf),
-			  "%s Widget: The Simple Widget class method "
-			  "'change_sensitive' is undefined.\nA function "
-			  "must be defined or inherited.",
-			  c->core_class.class_name);
+	snprintf(buf, sizeof(buf),
+		 "%s Widget: The Simple Widget class method "
+		 "'change_sensitive' is undefined.\n"
+		 "A function must be defined or inherited.",
+		 c->core_class.class_name);
 	XtWarning(buf);
 	c->simple_class.change_sensitive = ChangeSensitive;
     }
diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c
index 5e2c78c..8defdf7 100644
--- a/src/SimpleMenu.c
+++ b/src/SimpleMenu.c
@@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/Initer.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/Cardinals.h>
 #include <X11/Xaw/SimpleMenP.h>
 #include <X11/Xaw/SmeBSBP.h>
@@ -805,9 +804,9 @@ PositionMenuAction(Widget w, XEvent *event,
     if ((menu = FindMenu(w, params[0])) == NULL) {
 	char error_buf[BUFSIZ];
 
-	(void)XmuSnprintf(error_buf, sizeof(error_buf),
-			  "SimpleMenuWidget: could not find menu named %s.",
-			  params[0]);
+	snprintf(error_buf, sizeof(error_buf),
+		 "SimpleMenuWidget: could not find menu named %s.",
+		 params[0]);
 	XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
 	return;
     }
diff --git a/src/SmeBSB.c b/src/SmeBSB.c
index fd90c1a..52a789a 100644
--- a/src/SmeBSB.c
+++ b/src/SmeBSB.c
@@ -40,7 +40,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/StringDefs.h>
 #include <X11/Xos.h>
 #include <X11/Xmu/Drawing.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/Cardinals.h>
 #include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/SmeBSBP.h>
diff --git a/src/Text.c b/src/Text.c
index 67effc5..72387e9 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -83,7 +83,6 @@ SOFTWARE.
 #include <X11/Xfuncs.h>
 #include <X11/Xutil.h>
 #include <X11/Xmu/Misc.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xmu/Xmu.h>
 #include <X11/Xaw/Cardinals.h>
 #include <X11/Xaw/MultiSinkP.h>
diff --git a/src/TextAction.c b/src/TextAction.c
index 366b9b8..6705316 100644
--- a/src/TextAction.c
+++ b/src/TextAction.c
@@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xmu/Atoms.h>
 #include <X11/Xmu/Misc.h>
 #include <X11/Xmu/StdSel.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/MultiSinkP.h>
 #include <X11/Xaw/MultiSrcP.h>
 #include <X11/Xaw/TextP.h>
@@ -3399,9 +3398,10 @@ Numeric(Widget w, XEvent *event, String *params, Cardinal *num_params)
 		InsertChar(w, event, params, num_params);
 		return;
 	    }
-	    XmuSnprintf(err_buf, sizeof(err_buf),
-			"numeric: Invalid argument%s'%s'",
-			*num_params ? ", " : "", *num_params ? params[0] : "");
+	    snprintf(err_buf, sizeof(err_buf),
+		     "numeric: Invalid argument%s'%s'",
+		     *num_params ? ", " : "",
+		     *num_params ? params[0] : "");
 	    XtAppWarning(XtWidgetToApplicationContext(w), err_buf);
 	    ctx->text.numeric = False;
 	    ctx->text.mult = 1;
@@ -3495,9 +3495,9 @@ Multiply(Widget w, XEvent *event, String *params, Cardinal *num_params)
 	if ((mult = atoi(params[0])) == 0) {
 	char buf[BUFSIZ];
 
-	XmuSnprintf(buf, sizeof(buf),
-		    "%s %s", "Xaw Text Widget: multiply() argument",
-		    "must be a number greater than zero, or 'Reset'.");
+	snprintf(buf, sizeof(buf),
+		 "Xaw Text Widget: multiply() argument "
+		 "must be a number greater than zero, or 'Reset'.");
 	XtAppError(XtWidgetToApplicationContext(w), buf);
 	XBell(XtDisplay(w), 50);
 	return;
diff --git a/src/TextPop.c b/src/TextPop.c
index a09eaa8..953fa9a 100644
--- a/src/TextPop.c
+++ b/src/TextPop.c
@@ -53,7 +53,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Shell.h>
 #include <X11/Xos.h>
 #include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/TextP.h>
 #include <X11/Xaw/AsciiText.h>
 #include <X11/Xaw/Cardinals.h>
@@ -268,7 +267,7 @@ DoInsert(Widget w, XtPointer closure, XtPointer call_data)
     char buf[BUFSIZ], msg[BUFSIZ];
     Widget temp_widget;
 
-    (void)XmuSnprintf(buf, sizeof(buf), "%s.%s", FORM_NAME, TEXT_NAME);
+    snprintf(buf, sizeof(buf), "%s.%s", FORM_NAME, TEXT_NAME);
     if ((temp_widget = XtNameToWidget(ctx->text.file_insert, buf)) == NULL) {
 	(void)strcpy(msg,
 		     "Error: Could not get text widget from file insert popup");
@@ -278,7 +277,7 @@ DoInsert(Widget w, XtPointer closure, XtPointer call_data)
 	return;
     }
     else
-	(void)XmuSnprintf(msg, sizeof(msg), "Error: %s", strerror(errno));
+	snprintf(msg, sizeof(msg), "Error: %s", strerror(errno));
 
     (void)SetResourceByName(ctx->text.file_insert,
 			    LABEL_NAME, XtNlabel, (XtArgVal)msg);
@@ -536,9 +535,9 @@ _XawTextSearch(Widget w, XEvent *event, String *params, Cardinal *num_params)
     wchar_t wcs[1];
 
     if (*num_params < 1 || *num_params > 2) {
-	(void)XmuSnprintf(buf, sizeof(buf), "%s %s\n%s", SEARCH_HEADER,
-			  "This action must have only",
-			  "one or two parameters");
+	snprintf(buf, sizeof(buf), "%s %s\n%s", SEARCH_HEADER,
+		 "This action must have only",
+		 "one or two parameters");
 	XtAppWarning(XtWidgetToApplicationContext(w), buf);
 	return;
     }
@@ -564,9 +563,9 @@ _XawTextSearch(Widget w, XEvent *event, String *params, Cardinal *num_params)
 	    dir = XawsdRight;
 	    break;
 	default:
-	    (void)XmuSnprintf(buf, sizeof(buf), "%s %s\n%s", SEARCH_HEADER,
-			      "The first parameter must be",
-			      "Either 'backward' or 'forward'");
+	    snprintf(buf, sizeof(buf), "%s %s\n%s", SEARCH_HEADER,
+		     "The first parameter must be",
+		     "Either 'backward' or 'forward'");
 	    XtAppWarning(XtWidgetToApplicationContext(w), buf);
 	    return;
     }
@@ -879,7 +878,7 @@ DoSearch(struct SearchAndReplace *search)
 
 	ptr = GetString(search->search_text);
 	len = strlen(ptr);
-	(void)XmuSnprintf(msg, sizeof(msg), "%s", ptr);
+	snprintf(msg, sizeof(msg), "%s", ptr);
 
 	ptr = strchr(msg, '\n');
 	if (ptr != NULL || sizeof(msg) - 1 < len) {
@@ -1040,7 +1039,7 @@ Replace(struct SearchAndReplace *search, Bool once_only, Bool show_current)
 
 		    ptr = GetString(search->search_text);
 		    len = strlen(ptr);
-		    (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr);
+		    snprintf(msg, sizeof(msg), "%s", ptr);
 		    ptr = strchr(msg, '\n');
 		    if (ptr != NULL || sizeof(msg) - 1 < len) {
 			if (ptr != NULL)
@@ -1264,7 +1263,7 @@ SetResourceByName(Widget shell, char *name, char *res_name, XtArgVal value)
     Widget temp_widget;
     char buf[BUFSIZ];
 
-    (void)XmuSnprintf(buf, sizeof(buf), "%s.%s", FORM_NAME, name);
+    snprintf(buf, sizeof(buf), "%s.%s", FORM_NAME, name);
 
     if ((temp_widget = XtNameToWidget(shell, buf)) != NULL) {
 	SetResource(temp_widget, res_name, value);
@@ -1503,7 +1502,7 @@ WMProtocols(Widget w, XEvent *event, String *params, Cardinal *num_params)
 	Widget cancel;
 	char descendant[DISMISS_NAME_LEN + 2];
 
-	(void)XmuSnprintf(descendant, sizeof(descendant), "*%s", DISMISS_NAME);
+	snprintf(descendant, sizeof(descendant), "*%s", DISMISS_NAME);
 	cancel = XtNameToWidget(w, descendant);
 	if (cancel)
 	    XtCallCallbacks(cancel, XtNcallback, NULL);
diff --git a/src/TextSink.c b/src/TextSink.c
index 6ae2713..333701b 100644
--- a/src/TextSink.c
+++ b/src/TextSink.c
@@ -1220,16 +1220,16 @@ _XawTextSinkAddProperty(XawTextPropertyList *list, XawTextProperty *property,
     if (property->mask & XAW_TPROP_FOREGROUND) {
 	color.pixel = property->foreground;
 	XQueryColor(DisplayOfScreen(list->screen), list->colormap, &color);
-	XmuSnprintf(foreground, sizeof(foreground), "%04x%04x%04x",
-		    color.red, color.green, color.blue);
+	snprintf(foreground, sizeof(foreground), "%04x%04x%04x",
+		 color.red, color.green, color.blue);
     }
     else
 	strcpy(foreground, asterisk);
     if (property->mask & XAW_TPROP_BACKGROUND) {
 	color.pixel = property->background;
 	XQueryColor(DisplayOfScreen(list->screen), list->colormap, &color);
-	XmuSnprintf(background, sizeof(background), "%04x%04x%04x",
-		    color.red, color.green, color.blue);
+	snprintf(background, sizeof(background), "%04x%04x%04x",
+		 color.red, color.green, color.blue);
     }
     else
 	strcpy(background, asterisk);
@@ -1313,10 +1313,11 @@ _XawTextSinkAddProperty(XawTextPropertyList *list, XawTextProperty *property,
 
     /* XXX should do the best to load a suitable font here */
     if (!(result->mask & XAW_TPROP_FONT)) {
-	XmuSnprintf(identifier, sizeof(identifier),
-		    "-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s",
-		    foundry, family, weight, slant, setwidth, addstyle, pixel_size,
-		    point_size, res_x, res_y, spacing, avgwidth, registry, encoding);
+	snprintf(identifier, sizeof(identifier),
+		 "-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s",
+		 foundry, family, weight, slant, setwidth, addstyle,
+		 pixel_size, point_size, res_x, res_y, spacing, avgwidth,
+		 registry, encoding);
 	if ((result->font = XLoadQueryFont(DisplayOfScreen(list->screen),
 					   identifier)) != NULL) {
 	    result->mask |= XAW_TPROP_FONT;
@@ -1331,14 +1332,14 @@ _XawTextSinkAddProperty(XawTextPropertyList *list, XawTextProperty *property,
     else
 	xlfd = null;
 
-    XmuSnprintf(identifier, sizeof(identifier), "%08lx%08lx%s%s%d%d%d%d%s",
-		property->mask, property->xlfd_mask,
-		foreground, background,
-		(result->mask & XAW_TPROP_UNDERLINE) != 0,
-		(result->mask & XAW_TPROP_OVERSTRIKE) != 0,
-		(result->mask & XAW_TPROP_SUBSCRIPT) != 0,
-		(result->mask & XAW_TPROP_SUPERSCRIPT) != 0,
-		xlfd);
+    snprintf(identifier, sizeof(identifier), "%08lx%08lx%s%s%d%d%d%d%s",
+	     property->mask, property->xlfd_mask,
+	     foreground, background,
+	     (result->mask & XAW_TPROP_UNDERLINE) != 0,
+	     (result->mask & XAW_TPROP_OVERSTRIKE) != 0,
+	     (result->mask & XAW_TPROP_SUBSCRIPT) != 0,
+	     (result->mask & XAW_TPROP_SUPERSCRIPT) != 0,
+	     xlfd);
 
     quark = XrmStringToQuark(identifier);
     if (result->identifier == NULLQUARK)
@@ -1547,8 +1548,8 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen,
 	params = XawParseParamsString(tok);
 	ident = XrmStringToQuark(params->name);
 	if (ident == NULLQUARK) {
-	    XmuSnprintf(buffer, sizeof(buffer),
-			"Bad text property name \"%s\".", params->name);
+	    snprintf(buffer, sizeof(buffer), "Bad text property name \"%s\".",
+		     params->name);
 	    XtAppWarning(XtDisplayToApplicationContext
 			 (DisplayOfScreen(screen)), buffer);
 	    DestroyTextPropertyList(propl);
@@ -1570,8 +1571,8 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen,
 
 	    if ((prop->font = XLoadQueryFont(DisplayOfScreen(screen),
 					     argval->value)) == NULL) {
-		XmuSnprintf(buffer, sizeof(buffer),
-			    "Cannot load font \"%s\".", argval->value);
+		snprintf(buffer, sizeof(buffer), "Cannot load font \"%s\".",
+			 argval->value);
 		XtAppWarning(XtDisplayToApplicationContext
 			     (DisplayOfScreen(screen)), buffer);
 		DestroyTextPropertyList(propl);
@@ -1589,8 +1590,8 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen,
 	    argval->value) {
 	    if (!XAllocNamedColor(DisplayOfScreen(screen), colormap,
 				  argval->value, &color, &exact)) {
-		XmuSnprintf(buffer, sizeof(buffer),
-			    "Cannot allocate color \"%s\".", argval->value);
+		snprintf(buffer, sizeof(buffer),
+			 "Cannot allocate color \"%s\".", argval->value);
 		XtAppWarning(XtDisplayToApplicationContext
 			     (DisplayOfScreen(screen)), buffer);
 		DestroyTextPropertyList(propl);
@@ -1606,8 +1607,8 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen,
 	    argval->value) {
 	    if (!XAllocNamedColor(DisplayOfScreen(screen), colormap,
 				  argval->value, &color, &exact)) {
-		XmuSnprintf(buffer, sizeof(buffer),
-			    "Cannot allocate color \"%s\".", argval->value);
+		snprintf(buffer, sizeof(buffer),
+			 "Cannot allocate color \"%s\".", argval->value);
 		XtAppWarning(XtDisplayToApplicationContext
 			     (DisplayOfScreen(screen)), buffer);
 		DestroyTextPropertyList(propl);
diff --git a/src/Toggle.c b/src/Toggle.c
index 80e77e3..b484878 100644
--- a/src/Toggle.c
+++ b/src/Toggle.c
@@ -41,7 +41,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/StringDefs.h>
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Misc.h>
-#include <X11/Xmu/SysUtil.h>
 #include <X11/Xaw/ToggleP.h>
 #include <X11/Xaw/XawInit.h>