diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-27 22:40:02 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-02 17:12:49 -0800 |
commit | 38dce0209303b48054c884508633b4ce0d52a819 (patch) | |
tree | 347537ba1db65afbb875c11ec3441a3de7df60eb /src/Converters.c | |
parent | 83e4910b379cb9b9d69a0438eba3322470afda24 (diff) | |
download | xorg-lib-libXaw-38dce0209303b48054c884508633b4ce0d52a819.tar.gz |
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>
Diffstat (limited to 'src/Converters.c')
-rw-r--r-- | src/Converters.c | 35 |
1 files changed, 17 insertions, 18 deletions
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); |