From f0154141b1f1501490bac8e0235214bf8f00f715 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Fri, 9 Jan 2026 11:23:58 +0000 Subject: [PATCH] Resolve some more C23 compile issues, a generated file and a missed sub directory in dtinfo --- .../dtappbuilder/src/ab/dtbuilder.c.src | 2 +- .../dtinfo/dtinfo/src/Widgets/Panner.c | 20 ++++++------- .../dtinfo/dtinfo/src/Widgets/Pixmap.c | 27 +++++++++-------- .../dtinfo/dtinfo/src/Widgets/Porthole.c | 10 +++---- .../dtinfo/dtinfo/src/Widgets/Restraint.c | 12 ++++---- .../dtinfo/dtinfo/src/Widgets/Simple.c | 6 ++-- cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c | 30 +++++++++---------- 7 files changed, 54 insertions(+), 53 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src b/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src index 5c45a3f07..ba9415079 100644 --- a/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src +++ b/cde/programs/dtappbuilder/src/ab/dtbuilder.c.src @@ -2296,7 +2296,7 @@ exit_dtbuilder(int n) struct sigaction exit_action; struct sigaction ign_action; - ign_action.sa_handler = (void (*)())SIG_IGN; + ign_action.sa_handler = SIG_IGN; ign_action.sa_flags = 0; sigemptyset(&(ign_action.sa_mask)); diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c index 5e30837be..1c74ca0b9 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Panner.c @@ -167,14 +167,14 @@ static XtResource resources[] = { /* * widget class methods used below */ -static void Initialize(); /* create gc's */ -static void Realize(); /* create window */ -static void Destroy(); /* clean up widget */ -static void Resize(); /* need to rescale ourselves */ -static void Redisplay(); /* draw ourselves */ -static Boolean SetValues(); /* set all of the resources */ -static void SetValuesAlmost(); /* deal with failed setval geom req */ -static XtGeometryResult QueryGeometry(); /* say how big we would like to be */ +static void Initialize(Widget greq, Widget gnew, ArgList args, Cardinal *num_args); /* create gc's */ +static void Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr); /* create window */ +static void Destroy(Widget gw); /* clean up widget */ +static void Resize(Widget gw); /* need to rescale ourselves */ +static void Redisplay(Widget gw, XEvent *event, Region region); /* draw ourselves */ +static Boolean SetValues(Widget gcur, Widget greq, Widget gnew, ArgList args, Cardinal *num_args); /* set all of the resources */ +static void SetValuesAlmost(Widget gold, Widget gnew, XtWidgetGeometry *req, XtWidgetGeometry *reply); /* deal with failed setval geom req */ +static XtGeometryResult QueryGeometry(Widget gw, XtWidgetGeometry *intended, XtWidgetGeometry *pref); /* say how big we would like to be */ PannerClassRec pannerClassRec = { { /* core fields */ @@ -523,7 +523,7 @@ static int parse_page_string (char *s, int pagesize, int canvassize, Boolean *re *****************************************************************************/ -static void Initialize (Widget greq, Widget gnew) +static void Initialize (Widget greq, Widget gnew, ArgList args, Cardinal *num_args) { PannerWidget req = (PannerWidget) greq, new = (PannerWidget) gnew; Dimension defwidth, defheight; @@ -684,7 +684,7 @@ static void Redisplay (Widget gw, XEvent *event, Region region) /* ARGSUSED */ -static Boolean SetValues (Widget gcur, Widget greq, Widget gnew) +static Boolean SetValues (Widget gcur, Widget greq, Widget gnew, ArgList args, Cardinal *num_args) { PannerWidget cur = (PannerWidget) gcur; PannerWidget new = (PannerWidget) gnew; diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Pixmap.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Pixmap.c index db13515d4..25ad7cf2c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Pixmap.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Pixmap.c @@ -35,12 +35,12 @@ #define ON_DEBUG(x) #endif -static Boolean SetValues(); -static void Initialize(); -static void Destroy(); -static void Resize(); -static void ReDisplay(); -static XtGeometryResult QueryGeometry(); +static Boolean SetValues(PixmapWidget current, PixmapWidget request, PixmapWidget new, ArgList args, Cardinal *num_args); +static void Initialize(PixmapWidget req, PixmapWidget new, ArgList args, Cardinal *nargs); +static void Destroy(PixmapWidget w); +static void Resize(PixmapWidget w); +static void ReDisplay(PixmapWidget w, XExposeEvent *event, struct _XRegion *unused); +static XtGeometryResult QueryGeometry(PixmapWidget w, XtWidgetGeometry *proposed, XtWidgetGeometry *answer); /* static char *defaultTranslations[] = {""}; @@ -62,7 +62,7 @@ PixmapClassRec pixmapClassRec = { /* class_initialize */ NULL, /* class_part_initialize */ NULL, /* class_inited */ FALSE, - /* initialize */ Initialize, + /* initialize */ (void (*)(struct _WidgetRec *, struct _WidgetRec *, ArgList, Cardinal *)) Initialize, /* initialize_hook */ NULL, /* realize */ XtInheritRealize, /* actions */ NULL, @@ -74,10 +74,10 @@ PixmapClassRec pixmapClassRec = { /* compress_exposure */ FALSE, /* compress_enterleave */ TRUE, /* visible_interest */ FALSE, - /* destroy */ Destroy, - /* resize */ Resize, - /* expose */ ReDisplay, - /* set_values */ SetValues, + /* destroy */ (XtWidgetProc) Destroy, + /* resize */ (XtWidgetProc) Resize, + /* expose */ (void (*)(struct _WidgetRec *, XEvent *, struct _XRegion *)) ReDisplay, + /* set_values */ (Boolean (*)(Widget, Widget, Widget, ArgList, Cardinal *)) SetValues, /* set_values_hook */ NULL, /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ NULL, @@ -85,7 +85,8 @@ PixmapClassRec pixmapClassRec = { /* version */ XtVersion, /* callback_private */ NULL, /* tm_table */ 0, /* defaultTranslations*/ - /* query_geometry */ QueryGeometry, + /* query_geometry */ (XtGeometryResult +(*)(Widget, XtWidgetGeometry *, XtWidgetGeometry *)) QueryGeometry, /* display_accelerator */ XtInheritDisplayAccelerator, /* extension */ NULL }, @@ -208,7 +209,7 @@ QueryGeometry(PixmapWidget w, XtWidgetGeometry *proposed, XtWidgetGeometry *answ #endif static void -ReDisplay(PixmapWidget w, XExposeEvent *event) +ReDisplay(PixmapWidget w, XExposeEvent *event, struct _XRegion *unused) { ON_DEBUG(fprintf(stderr, "PixmapWidget: EXPOSE\n")); diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c index 8c6dc20f5..6f07fc927 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Porthole.c @@ -73,11 +73,11 @@ static XtResource resources[] = { /* * widget class methods used below */ -static void Realize(); /* set gravity and upcall */ -static void Resize(); /* report new size */ -static XtGeometryResult GeometryManager(); /* deal with child requests */ -static void ChangeManaged(); /* somebody added a new widget */ -static XtGeometryResult QueryGeometry(); /* say how big would like to be */ +static void Realize(Widget gw, Mask *valueMask, XSetWindowAttributes *attributes); /* set gravity and upcall */ +static void Resize(Widget gw); /* report new size */ +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *req, XtWidgetGeometry *reply); /* deal with child requests */ +static void ChangeManaged(Widget gw); /* somebody added a new widget */ +static XtGeometryResult QueryGeometry(Widget gw, XtWidgetGeometry *intended, XtWidgetGeometry *preferred); /* say how big would like to be */ #if XmVersion == 1002 static void ClassInitialize(); diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Restraint.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Restraint.c index 89f789c6c..3d0a79a20 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Restraint.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Restraint.c @@ -60,11 +60,11 @@ /* Static routine definitions */ -static void Initialize(); -static void ChangeManaged(); -static void Resize(); -static void Realize(); -static XtGeometryResult GeometryManager(); +static void Initialize(RestraintWidget original, RestraintWidget w, ArgList args, Cardinal *num_args); +static void ChangeManaged(RestraintWidget w); +static void Resize(RestraintWidget w); +static void Realize(Widget w, XtValueMask *value_mask, XSetWindowAttributes *attrs); +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply); /* The Restraint class record definition */ externaldef(restraintclassrec) RestraintClassRec restraintClassRec = @@ -89,7 +89,7 @@ externaldef(restraintclassrec) RestraintClassRec restraintClassRec = True, /* compress_enterleave */ False, /* visible_interest */ 0, /* destroy */ - Resize, /* resize */ + (XtWidgetProc) Resize, /* resize */ NULL, /* expose */ NULL, /* set_values */ NULL, /* set_values_hook */ diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c index 53c11778a..e424ac3f5 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Simple.c @@ -91,10 +91,10 @@ static XtResource resources[] = { }; static void ClassPartInitialize(WidgetClass); -static void ClassInitialize(); +static void ClassInitialize(void); static void Realize(Widget, Mask*, XSetWindowAttributes*); static void ConvertCursor(Widget); -static Boolean SetValues(); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); static Boolean ChangeSensitive(Widget); SimpleClassRec simpleClassRec = { @@ -246,7 +246,7 @@ ConvertCursor(Widget w) /* ARGSUSED */ -static Boolean SetValues(Widget current, Widget request, Widget new) +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { SimpleWidget s_old = (SimpleWidget) current; SimpleWidget s_new = (SimpleWidget) new; diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c b/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c index 5bbd7860a..4ef643a37 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c @@ -85,17 +85,17 @@ /* widget class method */ -static void ClassInitialize(); -static void Initialize(); -static void ConstraintInitialize(); -static void ConstraintDestroy(); -static Boolean ConstraintSetValues(); -static void Destroy(); -static Boolean SetValues(); -static XtGeometryResult GeometryManager(); -static void ChangeManaged(); -static void Redisplay(); -static XtGeometryResult QueryGeometry(); +static void ClassInitialize(void); +static void Initialize(Widget grequest, Widget gnew, ArgList args, Cardinal *num_args); +static void ConstraintInitialize(Widget request, Widget new, ArgList args, Cardinal *num_args); +static void ConstraintDestroy(Widget w); +static Boolean ConstraintSetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); +static void Destroy(Widget gw); +static Boolean SetValues(Widget gcurrent, Widget grequest, Widget gnew, ArgList args, Cardinal *num_args); +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply); +static void ChangeManaged(Widget gw); +static void Redisplay(TreeWidget tw, XEvent *event, Region region); +static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred); /* utility routines */ static void insert_node(Widget, Widget); @@ -164,7 +164,7 @@ TreeClassRec treeClassRec = { TRUE, /* visible_interest */ Destroy, /* destroy */ NULL, /* resize */ - Redisplay, /* expose */ + (void (*)(Widget, XEvent *, struct _XRegion *)) Redisplay, /* expose */ SetValues, /* set_values */ NULL, /* set_values_hook */ XtInheritSetValuesAlmost, /* set_values_almost */ @@ -343,7 +343,7 @@ static void ClassInitialize (void) } -static void Initialize (Widget grequest, Widget gnew) +static void Initialize (Widget grequest, Widget gnew, ArgList arguments, Cardinal *num_args) { TreeWidget request = (TreeWidget) grequest, new = (TreeWidget) gnew; Arg args[2]; @@ -397,7 +397,7 @@ static void Initialize (Widget grequest, Widget gnew) /* ARGSUSED */ -static void ConstraintInitialize (Widget request, Widget new) +static void ConstraintInitialize (Widget request, Widget new, ArgList args, Cardinal *num_args) { TreeConstraints tc = TREE_CONSTRAINT(new); TreeWidget tw = (TreeWidget) new->core.parent; @@ -426,7 +426,7 @@ static void ConstraintInitialize (Widget request, Widget new) /* ARGSUSED */ -static Boolean SetValues (Widget gcurrent, Widget grequest, Widget gnew) +static Boolean SetValues (Widget gcurrent, Widget grequest, Widget gnew, ArgList args, Cardinal *num_args) { TreeWidget current = (TreeWidget) gcurrent, new = (TreeWidget) gnew; Boolean redraw = FALSE;