aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/DisplayList.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 15:05:45 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 15:05:45 +0200
commit4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch)
tree3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXaw/src/DisplayList.c
parent5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff)
parent5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff)
downloadvcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz
vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2
vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXaw/src/DisplayList.c')
-rw-r--r--libXaw/src/DisplayList.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libXaw/src/DisplayList.c b/libXaw/src/DisplayList.c
index 6549650e7..4ef89aa0a 100644
--- a/libXaw/src/DisplayList.c
+++ b/libXaw/src/DisplayList.c
@@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -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);