win/X11 lint

This commit is contained in:
PatR
2016-02-13 10:58:44 -08:00
parent 3b4f2fbfa7
commit 962b3e43f4
3 changed files with 23 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winX.c $NHDT-Date: 1454977918 2016/02/09 00:31:58 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.39 $ */
/* NetHack 3.6 winX.c $NHDT-Date: 1455389907 2016/02/13 18:58:27 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.40 $ */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -225,10 +225,12 @@ find_free_window()
* This is an attempt to find some close readonly cell and use it.
*/
XtConvertArgRec const nhcolorConvertArgs[] = {
{ XtWidgetBaseOffset, (XtPointer) XtOffset(Widget, core.screen),
sizeof(Screen *) },
{ XtWidgetBaseOffset, (XtPointer) XtOffset(Widget, core.colormap),
sizeof(Colormap) }
{ XtWidgetBaseOffset,
(XtPointer) (ptrdiff_t) XtOffset(Widget, core.screen),
sizeof (Screen *) },
{ XtWidgetBaseOffset,
(XtPointer) (ptrdiff_t) XtOffset(Widget, core.colormap),
sizeof (Colormap) }
};
#define done(type, value) \

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winmap.c $NHDT-Date: 1454986883 2016/02/09 03:01:23 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.28 $ */
/* NetHack 3.6 winmap.c $NHDT-Date: 1455389908 2016/02/13 18:58:28 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.29 $ */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -151,8 +151,10 @@ int bkglyph UNUSED;
/*ARGSUSED*/
void
X11_cliparound(x, y)
int x, y;
int x UNUSED;
int y UNUSED;
{
return;
}
#endif /* CLIPPING */

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winmisc.c $NHDT-Date: 1454571527 2016/02/04 07:38:47 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.21 $ */
/* NetHack 3.6 winmisc.c $NHDT-Date: 1455389908 2016/02/13 18:58:28 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -68,16 +68,19 @@ static const char gend_select_translations[] = "#override\n\
static const char algn_select_translations[] = "#override\n\
<Key>: algn_key()";
static void FDECL(popup_delete, (Widget, XEvent *, String *, Cardinal *));
static void NDECL(ec_dismiss);
static Widget FDECL(make_menu,
(const char *, const char *, const char *, const char *,
XtCallbackProc, const char *, XtCallbackProc, int,
const char **, Widget **, XtCallbackProc, Widget *));
static void NDECL(init_extended_commands_popup);
static void FDECL(ps_quit, (Widget, XtPointer, XtPointer));
static void FDECL(ps_random, (Widget, XtPointer, XtPointer));
static void FDECL(ps_select, (Widget, XtPointer, XtPointer));
static void FDECL(extend_select, (Widget, XtPointer, XtPointer));
static void FDECL(extend_dismiss, (Widget, XtPointer, XtPointer));
static void FDECL(extend_help, (Widget, XtPointer, XtPointer));
static void FDECL(popup_delete, (Widget, XEvent *, String *, Cardinal *));
static void NDECL(ec_dismiss);
static void NDECL(init_extended_commands_popup);
static Widget FDECL(make_menu, (const char *, const char *, const char *,
const char *, XtCallbackProc, const char *,
XtCallbackProc, int, const char **,
Widget **, XtCallbackProc, Widget *));
/* Player Selection --------------------------------------------------------
*/
@@ -790,7 +793,7 @@ Cardinal *num_params;
/* don't beep */
return;
} else if (ch == '?') {
extend_help();
extend_help((Widget) 0, (XtPointer) 0, (XtPointer) 0);
return;
} else if (index("\033\n\r", ch)) {
if (ch == '\033') {