summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2019-11-25 20:49:28 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2019-11-25 20:51:05 -0500
commit9f5025729992607eaac987f7f82208018af84fb6 (patch)
tree9df698b2ef9c3b9f77dd1170fc7b20b4a799955c
parent4ea048a88a378d05bfef1633bcafae17a757e024 (diff)
downloadxorg-lib-libXaw-9f5025729992607eaac987f7f82208018af84fb6.tar.gz
reduce compiler warnings using casts, no object change
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r--src/AllWidgets.c86
-rw-r--r--src/AsciiSink.c2
-rw-r--r--src/Converters.c2
-rw-r--r--src/Grip.c2
-rw-r--r--src/Label.c6
-rw-r--r--src/List.c8
-rw-r--r--src/MultiSink.c2
-rw-r--r--src/MultiSrc.c2
-rw-r--r--src/Paned.c16
-rw-r--r--src/Scrollbar.c14
-rw-r--r--src/Simple.c4
-rw-r--r--src/SmeBSB.c6
-rw-r--r--src/SmeLine.c2
-rw-r--r--src/StripChart.c4
-rw-r--r--src/Text.c6
-rw-r--r--src/TextSink.c6
-rw-r--r--src/TextSrc.c2
-rw-r--r--src/Tip.c6
-rw-r--r--src/Toggle.c2
-rw-r--r--src/Tree.c2
-rw-r--r--src/XawIm.c2
21 files changed, 92 insertions, 90 deletions
diff --git a/src/AllWidgets.c b/src/AllWidgets.c
index 3b13438..8a7490f 100644
--- a/src/AllWidgets.c
+++ b/src/AllWidgets.c
@@ -60,50 +60,52 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xaw/Tree.h>
#include <X11/Xaw/Viewport.h>
+#define DATA(name,class) { (char *)name, class }
XmuWidgetNode XawWidgetArray[] = {
-{ "applicationShell", &applicationShellWidgetClass },
-{ "asciiSink", &asciiSinkObjectClass },
-{ "asciiSrc", &asciiSrcObjectClass },
-{ "asciiText", &asciiTextWidgetClass },
-{ "box", &boxWidgetClass },
-{ "command", &commandWidgetClass },
-{ "composite", &compositeWidgetClass },
-{ "constraint", &constraintWidgetClass },
-{ "core", &coreWidgetClass },
-{ "dialog", &dialogWidgetClass },
-{ "form", &formWidgetClass },
-{ "grip", &gripWidgetClass },
-{ "label", &labelWidgetClass },
-{ "list", &listWidgetClass },
-{ "menuButton", &menuButtonWidgetClass },
-{ "multiSink", &multiSinkObjectClass },
-{ "multiSrc", &multiSrcObjectClass },
-{ "object", &objectClass },
-{ "overrideShell", &overrideShellWidgetClass },
-{ "paned", &panedWidgetClass },
-{ "panner", &pannerWidgetClass },
-{ "porthole", &portholeWidgetClass },
-{ "rect", &rectObjClass },
-{ "repeater", &repeaterWidgetClass },
-{ "scrollbar", &scrollbarWidgetClass },
-{ "shell", &shellWidgetClass },
-{ "simpleMenu", &simpleMenuWidgetClass },
-{ "simple", &simpleWidgetClass },
-{ "smeBSB", &smeBSBObjectClass },
-{ "smeLine", &smeLineObjectClass },
-{ "sme", &smeObjectClass },
-{ "stripChart", &stripChartWidgetClass },
-{ "textSink", &textSinkObjectClass },
-{ "textSrc", &textSrcObjectClass },
-{ "text", &textWidgetClass },
-{ "toggle", &toggleWidgetClass },
-{ "topLevelShell", &topLevelShellWidgetClass },
-{ "transientShell", &transientShellWidgetClass },
-{ "tree", &treeWidgetClass },
-{ "vendorShell", &vendorShellWidgetClass },
-{ "viewport", &viewportWidgetClass },
-{ "wmShell", &wmShellWidgetClass },
+DATA( "applicationShell", &applicationShellWidgetClass ),
+DATA( "asciiSink", &asciiSinkObjectClass ),
+DATA( "asciiSrc", &asciiSrcObjectClass ),
+DATA( "asciiText", &asciiTextWidgetClass ),
+DATA( "box", &boxWidgetClass ),
+DATA( "command", &commandWidgetClass ),
+DATA( "composite", &compositeWidgetClass ),
+DATA( "constraint", &constraintWidgetClass ),
+DATA( "core", &coreWidgetClass ),
+DATA( "dialog", &dialogWidgetClass ),
+DATA( "form", &formWidgetClass ),
+DATA( "grip", &gripWidgetClass ),
+DATA( "label", &labelWidgetClass ),
+DATA( "list", &listWidgetClass ),
+DATA( "menuButton", &menuButtonWidgetClass ),
+DATA( "multiSink", &multiSinkObjectClass ),
+DATA( "multiSrc", &multiSrcObjectClass ),
+DATA( "object", &objectClass ),
+DATA( "overrideShell", &overrideShellWidgetClass ),
+DATA( "paned", &panedWidgetClass ),
+DATA( "panner", &pannerWidgetClass ),
+DATA( "porthole", &portholeWidgetClass ),
+DATA( "rect", &rectObjClass ),
+DATA( "repeater", &repeaterWidgetClass ),
+DATA( "scrollbar", &scrollbarWidgetClass ),
+DATA( "shell", &shellWidgetClass ),
+DATA( "simpleMenu", &simpleMenuWidgetClass ),
+DATA( "simple", &simpleWidgetClass ),
+DATA( "smeBSB", &smeBSBObjectClass ),
+DATA( "smeLine", &smeLineObjectClass ),
+DATA( "sme", &smeObjectClass ),
+DATA( "stripChart", &stripChartWidgetClass ),
+DATA( "textSink", &textSinkObjectClass ),
+DATA( "textSrc", &textSrcObjectClass ),
+DATA( "text", &textWidgetClass ),
+DATA( "toggle", &toggleWidgetClass ),
+DATA( "topLevelShell", &topLevelShellWidgetClass ),
+DATA( "transientShell", &transientShellWidgetClass ),
+DATA( "tree", &treeWidgetClass ),
+DATA( "vendorShell", &vendorShellWidgetClass ),
+DATA( "viewport", &viewportWidgetClass ),
+DATA( "wmShell", &wmShellWidgetClass ),
};
+#undef DATA
int XawWidgetCount = XtNumber(XawWidgetArray);
diff --git a/src/AsciiSink.c b/src/AsciiSink.c
index a30c98f..af715f0 100644
--- a/src/AsciiSink.c
+++ b/src/AsciiSink.c
@@ -118,7 +118,7 @@ static XtResource resources[] = {
sizeof(XFontStruct*),
offset(font),
XtRString,
- XtDefaultFont
+ (XtPointer)XtDefaultFont
},
{
XtNecho,
diff --git a/src/Converters.c b/src/Converters.c
index eeedda2..cc3efcb 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -398,7 +398,7 @@ _XawCvtAtomToString(Display *dpy, XrmValue *args _X_UNUSED, Cardinal *num_args,
XtPointer *converter_data _X_UNUSED)
{
static char *buffer = NULL;
- static char *nullatom = "NULL";
+ static char *nullatom = (char *)"NULL";
Cardinal size;
Atom atom;
diff --git a/src/Grip.c b/src/Grip.c
index 85f021b..1682a75 100644
--- a/src/Grip.c
+++ b/src/Grip.c
@@ -92,7 +92,7 @@ static XtResource resources[] = {
sizeof(Pixel),
XtOffsetOf(GripRec, core.background_pixel),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNborderWidth,
diff --git a/src/Label.c b/src/Label.c
index 142b7ad..4c95d42 100644
--- a/src/Label.c
+++ b/src/Label.c
@@ -100,7 +100,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(label.foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNfont,
@@ -109,7 +109,7 @@ static XtResource resources[] = {
sizeof(XFontStruct*),
offset(label.font),
XtRString,
- XtDefaultFont
+ (XtPointer)XtDefaultFont
},
{
XtNfontSet,
@@ -118,7 +118,7 @@ static XtResource resources[] = {
sizeof(XFontSet),
offset(label.fontset),
XtRString,
- XtDefaultFontSet
+ (XtPointer)XtDefaultFontSet
},
{
XtNlabel,
diff --git a/src/List.c b/src/List.c
index 4ba4ef8..697de33 100644
--- a/src/List.c
+++ b/src/List.c
@@ -105,7 +105,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(list.foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNcursor,
@@ -114,7 +114,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(simple.cursor),
XtRString,
- "left_ptr"
+ (XtPointer)"left_ptr"
},
{
XtNfont,
@@ -123,7 +123,7 @@ static XtResource resources[] = {
sizeof(XFontStruct*),
offset(list.font),
XtRString,
- XtDefaultFont
+ (XtPointer)XtDefaultFont
},
{
XtNfontSet,
@@ -132,7 +132,7 @@ static XtResource resources[] = {
sizeof(XFontSet),
offset(list.fontset),
XtRString,
- XtDefaultFontSet
+ (XtPointer)XtDefaultFontSet
},
{
XtNlist,
diff --git a/src/MultiSink.c b/src/MultiSink.c
index 92c0810..3e9a6f3 100644
--- a/src/MultiSink.c
+++ b/src/MultiSink.c
@@ -140,7 +140,7 @@ static XtResource resources[] = {
sizeof(XFontSet),
offset(fontset),
XtRString,
- XtDefaultFontSet
+ (XtPointer)XtDefaultFontSet
},
{
XtNecho,
diff --git a/src/MultiSrc.c b/src/MultiSrc.c
index 9a09602..b4a123c 100644
--- a/src/MultiSrc.c
+++ b/src/MultiSrc.c
@@ -1221,7 +1221,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
case XawtextAppend:
case XawtextEdit:
if (src->multi_src.string == NULL) {
- src->multi_src.string = "*multi-src*";
+ src->multi_src.string = (char *)"*multi-src*";
src->multi_src.is_tempfile = True;
}
else {
diff --git a/src/Paned.c b/src/Paned.c
index 257939b..1cd5e4a 100644
--- a/src/Paned.c
+++ b/src/Paned.c
@@ -256,7 +256,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(v_grip_cursor),
XtRString,
- "sb_v_double_arrow"
+ (XtPointer)"sb_v_double_arrow"
},
{
XtNhorizontalGripCursor,
@@ -265,7 +265,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(h_grip_cursor),
XtRString,
- "sb_h_double_arrow"
+ (XtPointer)"sb_h_double_arrow"
},
{
XtNbetweenCursor,
@@ -283,7 +283,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(v_adjust_this_cursor),
XtRString,
- "sb_left_arrow"
+ (XtPointer)"sb_left_arrow"
},
{
XtNhorizontalBetweenCursor,
@@ -292,7 +292,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(h_adjust_this_cursor),
XtRString,
- "sb_up_arrow"
+ (XtPointer)"sb_up_arrow"
},
{
XtNupperCursor,
@@ -301,7 +301,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(adjust_upper_cursor),
XtRString,
- "sb_up_arrow"
+ (XtPointer)"sb_up_arrow"
},
{
XtNlowerCursor,
@@ -310,7 +310,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(adjust_lower_cursor),
XtRString,
- "sb_down_arrow"
+ (XtPointer)"sb_down_arrow"
},
{
XtNleftCursor,
@@ -319,7 +319,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(adjust_left_cursor),
XtRString,
- "sb_left_arrow"
+ (XtPointer)"sb_left_arrow"
},
{
XtNrightCursor,
@@ -328,7 +328,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(adjust_right_cursor),
XtRString,
- "sb_right_arrow"
+ (XtPointer)"sb_right_arrow"
},
};
#undef offset
diff --git a/src/Scrollbar.c b/src/Scrollbar.c
index a4086fc..855013d 100644
--- a/src/Scrollbar.c
+++ b/src/Scrollbar.c
@@ -182,7 +182,7 @@ static XtResource resources[] = {
sizeof(Pixel),
Offset(scrollbar.foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNshown,
@@ -209,7 +209,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.verCursor),
XtRString,
- "sb_v_double_arrow"
+ (XtPointer)"sb_v_double_arrow"
},
{
XtNscrollHCursor,
@@ -218,7 +218,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.horCursor),
XtRString,
- "sb_h_double_arrow"
+ (XtPointer)"sb_h_double_arrow"
},
{
XtNscrollUCursor,
@@ -227,7 +227,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.upCursor),
XtRString,
- "sb_up_arrow"
+ (XtPointer)"sb_up_arrow"
},
{
XtNscrollDCursor,
@@ -236,7 +236,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.downCursor),
XtRString,
- "sb_down_arrow"
+ (XtPointer)"sb_down_arrow"
},
{
XtNscrollLCursor,
@@ -245,7 +245,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.leftCursor),
XtRString,
- "sb_left_arrow"
+ (XtPointer)"sb_left_arrow"
},
{
XtNscrollRCursor,
@@ -254,7 +254,7 @@ static XtResource resources[] = {
sizeof(Cursor),
Offset(scrollbar.rightCursor),
XtRString,
- "sb_right_arrow"
+ (XtPointer)"sb_right_arrow"
},
{
XtNminimumThumb,
diff --git a/src/Simple.c b/src/Simple.c
index d74dfc4..ae322cb 100644
--- a/src/Simple.c
+++ b/src/Simple.c
@@ -117,7 +117,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(pointer_fg),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNpointerColorBackground,
@@ -126,7 +126,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(pointer_bg),
XtRString,
- XtDefaultBackground
+ (XtPointer)XtDefaultBackground
},
{
XtNcursorName,
diff --git a/src/SmeBSB.c b/src/SmeBSB.c
index 923e562..e5df7e2 100644
--- a/src/SmeBSB.c
+++ b/src/SmeBSB.c
@@ -145,7 +145,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNfont,
@@ -154,7 +154,7 @@ static XtResource resources[] = {
sizeof(XFontStruct*),
offset(font),
XtRString,
- XtDefaultFont
+ (XtPointer)XtDefaultFont
},
{
XtNfontSet,
@@ -163,7 +163,7 @@ static XtResource resources[] = {
sizeof(XFontSet),
offset(fontset),
XtRString,
- XtDefaultFontSet
+ (XtPointer)XtDefaultFontSet
},
#ifndef OLDXAW
{
diff --git a/src/SmeLine.c b/src/SmeLine.c
index 5145baf..350b3fd 100644
--- a/src/SmeLine.c
+++ b/src/SmeLine.c
@@ -90,7 +90,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
};
#undef offset
diff --git a/src/StripChart.c b/src/StripChart.c
index 7ce5ffc..96ae48d 100644
--- a/src/StripChart.c
+++ b/src/StripChart.c
@@ -128,7 +128,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(strip_chart.fgpixel),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNhighlight,
@@ -137,7 +137,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(strip_chart.hipixel),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNgetValue,
diff --git a/src/Text.c b/src/Text.c
index e6689f6..9a2a2ef 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -292,7 +292,7 @@ static XtResource resources[] = {
sizeof(Cursor),
offset(simple.cursor),
XtRString,
- "xterm"
+ (XtPointer)"xterm"
},
{
XtNheight,
@@ -510,7 +510,7 @@ static Boolean
CvtScrollModeToString(Display *dpy, XrmValue *args _X_UNUSED, Cardinal *num_args _X_UNUSED,
XrmValue *fromVal, XrmValue *toVal _X_UNUSED, XtPointer *data _X_UNUSED)
{
- static char *buffer;
+ static String buffer;
Cardinal size;
switch (*(XawTextScrollMode *)fromVal->addr) {
@@ -572,7 +572,7 @@ static Boolean
CvtWrapModeToString(Display *dpy, XrmValue *args _X_UNUSED, Cardinal *num_args _X_UNUSED,
XrmValue *fromVal, XrmValue *toVal _X_UNUSED, XtPointer *data _X_UNUSED)
{
- static char *buffer;
+ static String buffer;
Cardinal size;
switch (*(XawTextWrapMode *)fromVal->addr) {
diff --git a/src/TextSink.c b/src/TextSink.c
index 4d582d5..4944dc1 100644
--- a/src/TextSink.c
+++ b/src/TextSink.c
@@ -100,7 +100,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(foreground),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XtNbackground,
@@ -109,7 +109,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(background),
XtRString,
- XtDefaultBackground
+ (XtPointer)XtDefaultBackground
},
#ifndef OLDXAW
{
@@ -119,7 +119,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(cursor_color),
XtRString,
- XtDefaultForeground
+ (XtPointer)XtDefaultForeground
},
{
XawNtextProperties,
diff --git a/src/TextSrc.c b/src/TextSrc.c
index 9799c71..0a9db66 100644
--- a/src/TextSrc.c
+++ b/src/TextSrc.c
@@ -143,7 +143,7 @@ static XtResource resources[] = {
sizeof(XawTextEditType),
offset(edit_mode),
XtRString,
- "read"
+ (XtPointer)"read"
},
#ifndef OLDXAW
{
diff --git a/src/Tip.c b/src/Tip.c
index d2de86b..417f084 100644
--- a/src/Tip.c
+++ b/src/Tip.c
@@ -92,7 +92,7 @@ static XtResource resources[] = {
sizeof(Pixel),
offset(foreground),
XtRString,
- XtDefaultForeground,
+ (XtPointer)XtDefaultForeground,
},
{
XtNfont,
@@ -101,7 +101,7 @@ static XtResource resources[] = {
sizeof(XFontStruct*),
offset(font),
XtRString,
- XtDefaultFont
+ (XtPointer)XtDefaultFont
},
{
XtNfontSet,
@@ -110,7 +110,7 @@ static XtResource resources[] = {
sizeof(XFontSet),
offset(fontset),
XtRString,
- XtDefaultFontSet
+ (XtPointer)XtDefaultFontSet
},
{
XtNtopMargin,
diff --git a/src/Toggle.c b/src/Toggle.c
index ce6957a..9b93d41 100644
--- a/src/Toggle.c
+++ b/src/Toggle.c
@@ -90,7 +90,7 @@ static XtResource resources[] = {
sizeof(Boolean),
offset(command.set),
XtRString,
- "off"
+ (XtPointer)"off"
},
{
XtNradioGroup,
diff --git a/src/Tree.c b/src/Tree.c
index e862bc6..b3485f5 100644
--- a/src/Tree.c
+++ b/src/Tree.c
@@ -109,7 +109,7 @@ static XtResource resources[] = {
XtOffsetOf(TreeRec, tree.vpad), XtRImmediate, (XtPointer) 0 },
{ XtNforeground, XtCForeground, XtRPixel, sizeof (Pixel),
XtOffsetOf(TreeRec, tree.foreground), XtRString,
- XtDefaultForeground},
+ (XtPointer) XtDefaultForeground},
{ XtNlineWidth, XtCLineWidth, XtRDimension, sizeof (Dimension),
XtOffsetOf(TreeRec, tree.line_width), XtRImmediate, (XtPointer) 0 },
{ XtNgravity, XtCGravity, XtRGravity, sizeof (XtGravity),
diff --git a/src/XawIm.c b/src/XawIm.c
index ae2b48c..786d208 100644
--- a/src/XawIm.c
+++ b/src/XawIm.c
@@ -155,7 +155,7 @@ static XtResource resources[] =
{
{
XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet),
- Offset (font_set), XtRString, XtDefaultFontSet
+ Offset (font_set), XtRString, (XtPointer)XtDefaultFontSet
},
{
XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),