nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix warnings

Browse Source
This commit is contained in:
Pasi Kallinen
2017-10-14 13:48:44 +03:00
parent 04b08298a3
commit 1caa212bd9
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win/X11/Window.c
View File

@@ -121,7 +121,7 @@ Region region; /* unused */
nhUse(region); nhUse(region);
/* This isn't correct - we need to call the callback with region. */ /* This isn't correct - we need to call the callback with region. */
XtCallCallbacks(w, XtNexposeCallback, (caddr_t) event); XtCallCallbacks(w, XtNexposeCallback, (XtPointer)event);
} }
/* ARGSUSED */ /* ARGSUSED */
@@ -129,7 +129,7 @@ static void
Resize(w) Resize(w)
Widget w; Widget w;
{ {
XtCallCallbacks(w, XtNresizeCallback, (caddr_t) 0); XtCallCallbacks(w, XtNresizeCallback, (XtPointer) 0);
} }
WindowClassRec windowClassRec = { WindowClassRec windowClassRec = {

54
win/X11/winmisc.c
View File

@@ -621,7 +621,7 @@ X11_player_selection_setupOthers()
static void static void
racetoggleCallback(w, client, call) racetoggleCallback(w, client, call)
Widget w; Widget w;
caddr_t client, call; XtPointer client, call;
{ {
Arg args[2]; Arg args[2];
int j, valid; int j, valid;
@@ -662,7 +662,7 @@ caddr_t client, call;
static void static void
roletoggleCallback(w, client, call) roletoggleCallback(w, client, call)
Widget w; Widget w;
caddr_t client, call; XtPointer client, call;
{ {
Arg args[2]; Arg args[2];
@@ -704,7 +704,7 @@ caddr_t client, call;
static void static void
gendertoggleCallback(w, client, call) gendertoggleCallback(w, client, call)
Widget w; Widget w;
caddr_t client, call; XtPointer client, call;
{ {
int r = xtp2i(XawToggleGetCurrent(plsel_gend_radios[0])) - 1; int r = xtp2i(XawToggleGetCurrent(plsel_gend_radios[0])) - 1;
@@ -718,7 +718,7 @@ caddr_t client, call;
static void static void
aligntoggleCallback(w, client, call) aligntoggleCallback(w, client, call)
Widget w; Widget w;
caddr_t client, call; XtPointer client, call;
{ {
int r = xtp2i(XawToggleGetCurrent(plsel_align_radios[0])) - 1; int r = xtp2i(XawToggleGetCurrent(plsel_align_radios[0])) - 1;
@@ -826,7 +826,7 @@ Widget form;
XtInstallAccelerators(plsel_name_input, plsel_name_input); XtInstallAccelerators(plsel_name_input, plsel_name_input);
XtSetKeyboardFocus(form, plsel_name_input); XtSetKeyboardFocus(form, plsel_name_input);
} else { } else {
XtSetArg(args[0], XtNdisplayCaret, False); XtSetArg(args[0], nhStr(XtNdisplayCaret), False);
XtSetValues(plsel_name_input, args, ONE); XtSetValues(plsel_name_input, args, ONE);
} }
@@ -925,9 +925,9 @@ X11_player_selection_dialog()
tmpwidget); num_args++; tmpwidget); num_args++;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
if (i > 0) if (i > 0)
XtSetArg(args[num_args], XtNradioGroup, XtSetArg(args[num_args], nhStr(XtNradioGroup),
plsel_race_radios[0]); num_args++; plsel_race_radios[0]); num_args++;
XtSetArg(args[num_args], XtNradioData, (i + 1)); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), (i + 1)); num_args++;
racewidget = XtCreateManagedWidget(races[i].noun, racewidget = XtCreateManagedWidget(races[i].noun,
toggleWidgetClass, toggleWidgetClass,
@@ -988,9 +988,9 @@ X11_player_selection_dialog()
tmpwidget); num_args++; tmpwidget); num_args++;
XtSetArg(args[num_args], nhStr(XtNwidth), cwid); num_args++; XtSetArg(args[num_args], nhStr(XtNwidth), cwid); num_args++;
if (i > 0) if (i > 0)
XtSetArg(args[num_args], XtNradioGroup, XtSetArg(args[num_args], nhStr(XtNradioGroup),
plsel_role_radios[0]); num_args++; plsel_role_radios[0]); num_args++;
XtSetArg(args[num_args], XtNradioData, (i + 1)); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), (i + 1)); num_args++;
rolewidget = XtCreateManagedWidget(roles[i].name.m, rolewidget = XtCreateManagedWidget(roles[i].name.m,
toggleWidgetClass, toggleWidgetClass,
@@ -1040,15 +1040,15 @@ X11_player_selection_dialog()
/* gender radio buttons */ /* gender radio buttons */
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
XtSetArg(args[num_args], XtNradioData, 1); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), 1); num_args++;
plsel_gend_radios[0] = gend_radio_m plsel_gend_radios[0] = gend_radio_m
= XtCreateManagedWidget("Male", toggleWidgetClass, = XtCreateManagedWidget("Male", toggleWidgetClass,
gend_form2, args, num_args); gend_form2, args, num_args);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNfromVert, gend_radio_m); num_args++; XtSetArg(args[num_args], nhStr(XtNfromVert), gend_radio_m); num_args++;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
XtSetArg(args[num_args], XtNradioGroup, plsel_gend_radios[0]); num_args++; XtSetArg(args[num_args], nhStr(XtNradioGroup), plsel_gend_radios[0]); num_args++;
XtSetArg(args[num_args], XtNradioData, 2); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), 2); num_args++;
plsel_gend_radios[1] = gend_radio_f plsel_gend_radios[1] = gend_radio_f
= XtCreateManagedWidget("Female", toggleWidgetClass, = XtCreateManagedWidget("Female", toggleWidgetClass,
gend_form2, args, num_args); gend_form2, args, num_args);
@@ -1056,9 +1056,9 @@ X11_player_selection_dialog()
XawToggleUnsetCurrent(plsel_gend_radios[0]); XawToggleUnsetCurrent(plsel_gend_radios[0]);
XtAddCallback(gend_radio_m, XtNcallback, XtAddCallback(gend_radio_m, XtNcallback,
gendertoggleCallback, (caddr_t) (1)); gendertoggleCallback, (XtPointer) (1));
XtAddCallback(gend_radio_f, XtNcallback, XtAddCallback(gend_radio_f, XtNcallback,
gendertoggleCallback, (caddr_t) (2)); gendertoggleCallback, (XtPointer) (2));
/********************************************/ /********************************************/
@@ -1068,7 +1068,7 @@ X11_player_selection_dialog()
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNfromVert), gend_form); num_args++; XtSetArg(args[num_args], nhStr(XtNfromVert), gend_form); num_args++;
XtSetArg(args[num_args], XtNvertDistance, 30); num_args++; XtSetArg(args[num_args], nhStr(XtNvertDistance), 30); num_args++;
XtSetArg(args[num_args], nhStr(XtNfromHoriz), role_form); num_args++; XtSetArg(args[num_args], nhStr(XtNfromHoriz), role_form); num_args++;
align_form = XtCreateManagedWidget("align_form", formWidgetClass, form, align_form = XtCreateManagedWidget("align_form", formWidgetClass, form,
args, num_args); args, num_args);
@@ -1098,23 +1098,23 @@ X11_player_selection_dialog()
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
XtSetArg(args[num_args], XtNradioData, 1); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), 1); num_args++;
plsel_align_radios[0] = align_radio_l plsel_align_radios[0] = align_radio_l
= XtCreateManagedWidget("Lawful", toggleWidgetClass, = XtCreateManagedWidget("Lawful", toggleWidgetClass,
align_form2, args, num_args); align_form2, args, num_args);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNfromVert, align_radio_l); num_args++; XtSetArg(args[num_args], nhStr(XtNfromVert), align_radio_l); num_args++;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
XtSetArg(args[num_args], XtNradioGroup, plsel_align_radios[0]); num_args++; XtSetArg(args[num_args], nhStr(XtNradioGroup), plsel_align_radios[0]); num_args++;
XtSetArg(args[num_args], XtNradioData, 2); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), 2); num_args++;
plsel_align_radios[1] = align_radio_n plsel_align_radios[1] = align_radio_n
= XtCreateManagedWidget("Neutral", toggleWidgetClass, = XtCreateManagedWidget("Neutral", toggleWidgetClass,
align_form2, args, num_args); align_form2, args, num_args);
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNfromVert, align_radio_n); num_args++; XtSetArg(args[num_args], nhStr(XtNfromVert), align_radio_n); num_args++;
XtSetArg(args[num_args], XtNwidth, cwid); num_args++; XtSetArg(args[num_args], XtNwidth, cwid); num_args++;
XtSetArg(args[num_args], XtNradioGroup, plsel_align_radios[0]); num_args++; XtSetArg(args[num_args], nhStr(XtNradioGroup), plsel_align_radios[0]); num_args++;
XtSetArg(args[num_args], XtNradioData, 3); num_args++; XtSetArg(args[num_args], nhStr(XtNradioData), 3); num_args++;
plsel_align_radios[2] = align_radio_c = XtCreateManagedWidget("Chaotic", plsel_align_radios[2] = align_radio_c = XtCreateManagedWidget("Chaotic",
toggleWidgetClass, toggleWidgetClass,
align_form2, align_form2,
@@ -1123,11 +1123,11 @@ X11_player_selection_dialog()
XawToggleUnsetCurrent(plsel_align_radios[0]); XawToggleUnsetCurrent(plsel_align_radios[0]);
XtAddCallback(align_radio_l, XtNcallback, XtAddCallback(align_radio_l, XtNcallback,
aligntoggleCallback, (caddr_t) (1)); aligntoggleCallback, (XtPointer) (1));
XtAddCallback(align_radio_n, XtNcallback, XtAddCallback(align_radio_n, XtNcallback,
aligntoggleCallback, (caddr_t) (2)); aligntoggleCallback, (XtPointer) (2));
XtAddCallback(align_radio_c, XtNcallback, XtAddCallback(align_radio_c, XtNcallback,
aligntoggleCallback, (caddr_t) (3)); aligntoggleCallback, (XtPointer) (3));
/********************************************/ /********************************************/
@@ -1135,7 +1135,7 @@ X11_player_selection_dialog()
num_args = 0; num_args = 0;
XtSetArg(args[num_args], nhStr(XtNfromVert), align_form); num_args++; XtSetArg(args[num_args], nhStr(XtNfromVert), align_form); num_args++;
XtSetArg(args[num_args], XtNvertDistance, 30); num_args++; XtSetArg(args[num_args], nhStr(XtNvertDistance), 30); num_args++;
XtSetArg(args[num_args], nhStr(XtNrightMargin), 0); num_args++; XtSetArg(args[num_args], nhStr(XtNrightMargin), 0); num_args++;
XtSetArg(args[num_args], nhStr(XtNfromHoriz), role_form); num_args++; XtSetArg(args[num_args], nhStr(XtNfromHoriz), role_form); num_args++;
XtSetArg(args[num_args], XtNforceBars, False); num_args++; XtSetArg(args[num_args], XtNforceBars, False); num_args++;