Quiet 64 -Wunused-parameter warnings from clang 13

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/app/xmag/-/merge_requests/5>

5 files changed, 60 insertions, 50 deletions

diff --git a/CutPaste.c b/CutPaste.c
index 36a4a13..1bbca8d 100644
--- a/CutPaste.c
+++ b/CutPaste.c
@@ -39,7 +39,6 @@ from The Open Group.
 #include <stdio.h>
 
 
-/*ARGSUSED*/
 static Boolean
 ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
 		 XtPointer *value, unsigned long *length, int *format)
@@ -88,11 +87,10 @@ SWGrabSelection(Widget w, Time time)
 }
 
 
-/*ARGSUSED*/
 static void
-SelectionCallback(Widget w, XtPointer client_data, Atom *selection,
-		  Atom *type, XtPointer value, unsigned long *length,
-		  int *format)
+SelectionCallback(Widget w, _X_UNUSED XtPointer client_data,
+                  _X_UNUSED Atom *selection, Atom *type, XtPointer value,
+                  _X_UNUSED unsigned long *length, _X_UNUSED int *format)
 {
 
     if  (*type == XA_PIXMAP) {
diff --git a/RootWin.c b/RootWin.c
index 607860d..7960d38 100644
--- a/RootWin.c
+++ b/RootWin.c
@@ -75,9 +75,9 @@ static RootWindowClassRec rootWindowClassRec = {
 
 WidgetClass rootWindowWidgetClass = (WidgetClass)&rootWindowClassRec;
 
-/*ARGSUSED*/
 static void
-Realize(Widget w, XtValueMask *value_mask, XSetWindowAttributes *attributes)
+Realize(Widget w, _X_UNUSED XtValueMask *value_mask,
+        _X_UNUSED XSetWindowAttributes *attributes)
 {
     w->core.window = RootWindowOfScreen(w->core.screen);
 }
diff --git a/Scale.c b/Scale.c
index aa196f7..2e9630f 100644
--- a/Scale.c
+++ b/Scale.c
@@ -266,9 +266,9 @@ GetRectangleBuffer(ScaleWidget sw, Cardinal buffer_size)
 
 
 
-/* ARGSUSED */
 static void
-Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
+Initialize(_X_UNUSED Widget request, Widget new,
+           _X_UNUSED ArgList args, _X_UNUSED Cardinal *num_args)
 {
     ScaleWidget new_sw = (ScaleWidget) new;
 
@@ -543,9 +543,8 @@ SWGetImagePixel(Widget w, Position x, Position y,
 
 
 
-/* ARGSUSED */
 static void
-Redisplay(Widget w, XEvent *event, Region region)
+Redisplay(Widget w, XEvent *event, _X_UNUSED Region region)
 {
     ScaleWidget sw = (ScaleWidget) w;
     Position  x, y, img_x, img_y;
@@ -793,9 +792,8 @@ Destroy(Widget w)
 
 
 
-/* ARGSUSED */
 static Boolean
-SetValues(Widget current, Widget request, Widget new,
+SetValues(Widget current, _X_UNUSED Widget request, Widget new,
 	  ArgList args, Cardinal *num_args)
 {
     ScaleWidget cur_sw = (ScaleWidget) current;
@@ -939,7 +937,8 @@ SetValues(Widget current, Widget request, Widget new,
 
 
 void
-SWUnscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWUnscale(Widget w, _X_UNUSED XEvent *event,
+          _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     ScaleWidget sw = (ScaleWidget) w;
 
@@ -951,7 +950,8 @@ SWUnscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 
 void
-SWAutoscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWAutoscale(Widget w, _X_UNUSED XEvent *event,
+            _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     ScaleWidget sw = (ScaleWidget) w;
 
@@ -963,7 +963,8 @@ SWAutoscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 
 void
-SWInitialSize(Widget w, XEvent *event, String *params, Cardinal *num_params)
+SWInitialSize(Widget w, _X_UNUSED XEvent *event,
+              _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     ScaleWidget sw = (ScaleWidget) w;
 
@@ -996,7 +997,8 @@ SWSetImage(Widget w, XImage *image)
 
 
 void
-RequestSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+RequestSelection(Widget w, XEvent *event,
+                 _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     SWRequestSelection(w, event->xbutton.time);
 }
@@ -1004,7 +1006,8 @@ RequestSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 
 void
-GrabSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+GrabSelection(Widget w, XEvent *event,
+              _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     SWGrabSelection(w, event->xbutton.time);
 }
diff --git a/configure.ac b/configure.ac
index 558fda3..b15948f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_SEARCH_LIBS([lrint], [m])
 AC_CHECK_FUNCS([lrint])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XMAG, [xaw7 xmu xt x11 xproto >= 7.0.17])
+PKG_CHECK_MODULES(XMAG, [xaw7 xmu xt x11 xproto >= 7.0.22])
 
 xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
 AC_ARG_WITH(appdefaultdir,
diff --git a/xmag.c b/xmag.c
index da608fd..914b095 100644
--- a/xmag.c
+++ b/xmag.c
@@ -213,8 +213,9 @@ Error(Display *display, XErrorEvent *err)
  * CloseAP() -- Close this dialog.  If its the last one exit the program.
  *
  */
-static void			/* ARGSUSED */
-CloseAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+CloseAP(Widget w, XEvent *event,
+        _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   Arg wargs[2]; int n; hlPtr data;
   if (!--numXmags) exit(0);
@@ -234,8 +235,9 @@ CloseAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
  * SetCmapPropsAP() -- Put the scale widget first in WM_COLORMAP_WINDOWS
  *
  */
-static void			/* ARGSUSED */
-SetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+SetCmapPropsAP(Widget w, _X_UNUSED XEvent *event,
+               _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   Arg wargs[2]; int n; hlPtr data;
   n = 0;			/* get user data */
@@ -254,8 +256,9 @@ SetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
  * UnsetCmapPropsAP() -- Put the shell first in WM_COLORMAP_WINDOWS
  *
  */
-static void			/* ARGSUSED */
-UnsetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+UnsetCmapPropsAP(Widget w, _X_UNUSED XEvent *event,
+                 _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   Arg wargs[2]; int n; hlPtr data;
   n = 0;			/* get user data */
@@ -274,8 +277,9 @@ UnsetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
  * NewAP() -- Create an additional xmag dialog. THIS IS A COPY OF NewEH
  *                                              FIND A BETTER WAY....
  */
-static void			/* ARGSUSED */
-NewAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+NewAP(_X_UNUSED Widget w, _X_UNUSED XEvent *event,
+      _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   StartRootPtrGrab(True, NULL);
 }
@@ -285,8 +289,9 @@ NewAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
 /*
  * ReplaceAP() -- Replace this particular xmag dialog.
  */
-static void                     /* ARGSUSED */
-ReplaceAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+ReplaceAP(Widget w, _X_UNUSED XEvent *event,
+          _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   Arg wargs[2]; int n; hlPtr data;
   n = 0;			/* get user data */
@@ -300,8 +305,9 @@ ReplaceAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
 /*
  * PopupPixelAP() -- Show pixel information.
  */
-static void			/* ARGSUSED */
-PopupPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+PopupPixelAP(Widget w, XEvent *event,
+             _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     Position scale_x, scale_y;
     Dimension scale_height;
@@ -348,8 +354,9 @@ PopupPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
 /*
  * UpdatePixelAP() -- Update pixel information.
  */
-static void			/* ARGSUSED */
-UpdatePixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+UpdatePixelAP(Widget w, XEvent *event,
+              _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
     Position x, y;
     Pixel pixel;
@@ -384,8 +391,9 @@ UpdatePixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
 /*
  * PopdownPixelAP() -- Remove pixel info.
  */
-static void			/* ARGSUSED */
-PopdownPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+PopdownPixelAP(Widget w, _X_UNUSED XEvent *event,
+               _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
   int n;
   Arg wargs[3];
@@ -401,8 +409,9 @@ PopdownPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 
 
-static void			/* ARGSUSED */
-SelectRegionAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
+static void
+SelectRegionAP(_X_UNUSED Widget w, _X_UNUSED XEvent *event,
+               _X_UNUSED String *params, _X_UNUSED Cardinal *num_params)
 {
 /***** NOT SURE WHAT TO DO WITH THIS
     if (app_resources.unmap)
@@ -451,7 +460,7 @@ CheckPoints(Position *x1, Position *x2, Position *y1, Position *y2)
  * HighlightTO() -- Timer to highlight the selection box
  */
 static void
-HighlightTO(XtPointer closure, XtIntervalId *id)	/* ARGSUSED */
+HighlightTO(XtPointer closure, _X_UNUSED XtIntervalId *id)
 {
   hlPtr data = (hlPtr)closure;
   XGrabServer(dpy);
@@ -487,8 +496,8 @@ HighlightTO(XtPointer closure, XtIntervalId *id)	/* ARGSUSED */
  * CloseCB() -- Delete this xmag dialog.  If its the only one on the screen
  *             then exit.
  */
-static void			/* ARGSUSED */
-CloseCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+CloseCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
 {
   Widget shell = (Widget)clientData;
   if (!--numXmags) exit(0);
@@ -501,8 +510,8 @@ CloseCB(Widget w, XtPointer clientData, XtPointer callData)
 /*
  * ReplaceCB() -- Replace this particular xmag dialog.
  */
-static void                     /* ARGSUSED */
-ReplaceCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+ReplaceCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
 {
   hlPtr data = (hlPtr)clientData;
   StartRootPtrGrab(False, data);
@@ -513,8 +522,8 @@ ReplaceCB(Widget w, XtPointer clientData, XtPointer callData)
 /*
  * NewCB() -- Create an additional xmag dialog.
  */
-static void			/* ARGSUSED */
-NewCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+NewCB(_X_UNUSED Widget w, _X_UNUSED XtPointer clientData, _X_UNUSED XtPointer callData)
 {
   StartRootPtrGrab(True, NULL);
 }
@@ -524,8 +533,8 @@ NewCB(Widget w, XtPointer clientData, XtPointer callData)
 /*
  * SelectCB() -- Own the primary selection.
  */
-static void			/* ARGSUSED */
-SelectCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+SelectCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
 {
   hlPtr data = (hlPtr)clientData;
   SWGrabSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
@@ -536,8 +545,8 @@ SelectCB(Widget w, XtPointer clientData, XtPointer callData)
 /*
  * PasteCB() -- Paste from the primary selection into xmag.
  */
-static void			/* ARGSUSED */
-PasteCB(Widget w, XtPointer clientData, XtPointer callData)
+static void
+PasteCB(_X_UNUSED Widget w, XtPointer clientData, _X_UNUSED XtPointer callData)
 {
   hlPtr data = (hlPtr)clientData;
   SWRequestSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
@@ -596,7 +605,7 @@ FindWindow(int x, int y)	/* Location of cursor */
  */
 static void
 ResizeEH(Widget w, XtPointer closure, XEvent *event,
-	 Boolean *continue_to_dispatch)	/* ARGSUSED */
+	 _X_UNUSED Boolean *continue_to_dispatch)
 {
   hlPtr data = (hlPtr)closure;
   switch (event->type) {
@@ -635,7 +644,7 @@ ResizeEH(Widget w, XtPointer closure, XEvent *event,
  */
 static void
 DragEH(Widget w, XtPointer closure, XEvent *event,
-       Boolean *continue_to_dispatch) /* ARGSUSED */
+       _X_UNUSED Boolean *continue_to_dispatch)
 {
   hlPtr data = (hlPtr)closure;
   switch (event->type) {