From 0f65f6be81e8117ab0ad67ad3945779f682870d8 Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Wed, 3 Dec 2025 22:06:41 -0800 Subject: [PATCH 1/8] Replaced the old-style function declarations with modern C-style declarations for better readability and maintainability. --- villns.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/villns.c b/villns.c index 373843c..f169d3a 100644 --- a/villns.c +++ b/villns.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical trollp_(arg) -integer arg; +logical trollp_(integer arg) { /* System generated locals */ logical ret_val; @@ -167,8 +166,7 @@ integer arg; /* DECLARATIONS */ -logical cyclop_(arg) -integer arg; +logical cyclop_(integer arg) { /* System generated locals */ integer i__1, i__2; @@ -306,8 +304,7 @@ integer arg; /* DECLARATIONS */ -logical thiefp_(arg) -integer arg; +logical thiefp_(integer arg) { /* System generated locals */ integer i__1; From fdf80476094ed6a866be691eadfa8ae21ea9ae88 Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:15:09 -0800 Subject: [PATCH 2/8] Fixed a function definition without a prototype is deprecated in all versions of C and is not supported in C23 --- actors.c | 3 +-- ballop.c | 3 +-- clockr.c | 7 +------ demons.c | 10 ++-------- dgame.c | 6 ++---- dinit.c | 19 ++++++------------- dmain.c | 4 +--- dso1.c | 11 +++-------- dso2.c | 10 +++------- dso3.c | 17 +++-------------- dso4.c | 24 +++++------------------- dso5.c | 16 ++++------------ dso6.c | 7 ++----- dso7.c | 11 +++-------- dsub.c | 52 +++++++++++++--------------------------------------- dverb1.c | 12 ++++-------- dverb2.c | 3 +-- lightp.c | 3 +-- nobjs.c | 8 ++------ np.c | 21 ++++----------------- np1.c | 5 +---- np2.c | 19 +++---------------- np3.c | 20 ++++---------------- nrooms.c | 14 +++----------- objcts.c | 4 +--- rooms.c | 3 +-- sobjs.c | 4 +--- supp.c | 11 +++-------- sverbs.c | 3 +-- verbs.c | 3 +-- 30 files changed, 81 insertions(+), 252 deletions(-) diff --git a/actors.c b/actors.c index 6ac023d..5f158e2 100644 --- a/actors.c +++ b/actors.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical aappli_(ri) -integer ri; +logical aappli_(integer ri) { /* System generated locals */ logical ret_val; diff --git a/ballop.c b/ballop.c index d1ea8e2..e7f05ed 100644 --- a/ballop.c +++ b/ballop.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical ballop_(arg) -integer arg; +logical ballop_(integer arg) { /* System generated locals */ logical ret_val; diff --git a/clockr.c b/clockr.c index 24592ea..dfa4efc 100644 --- a/clockr.c +++ b/clockr.c @@ -763,12 +763,7 @@ integer ri; /* DECLARATIONS */ -static void litint_(obj, ctr, cev, ticks, tickln) -integer obj; -integer *ctr; -integer cev; -const integer *ticks; -integer tickln; +static void litint_(integer obj, integer *ctr, integer cev, const integer *ticks, integer tickln) { /* Parameter adjustments */ --ticks; diff --git a/demons.c b/demons.c index 130c5ce..46253e0 100644 --- a/demons.c +++ b/demons.c @@ -175,12 +175,7 @@ void fightd_() /* DECLARATIONS */ -integer blow_(h, v, rmk, hflg, out) -integer h; -integer v; -integer rmk; -logical hflg; -integer out; +integer blow_(integer h, integer v, integer rmk, logical hflg, integer out) { /* Initialized data */ @@ -581,8 +576,7 @@ void swordd_() /* INFEST- SUBROUTINE TO TEST FOR INFESTED ROOM */ /* DECLARATIONS */ -static logical infest_(r) -integer r; +static logical infest_(integer r) { /* System generated locals */ logical ret_val; diff --git a/dgame.c b/dgame.c index a211a14..bb94f23 100644 --- a/dgame.c +++ b/dgame.c @@ -205,8 +205,7 @@ void game_() /* DECLARATIONS */ -static void xendmv_(flag) -logical flag; +static void xendmv_(logical flag) { /* Local variables */ logical f; @@ -241,8 +240,7 @@ logical flag; /* DECLARATIONS */ -static logical xvehic_(n) -integer n; +static logical xvehic_(integer n) { /* System generated locals */ logical ret_val; diff --git a/dinit.c b/dinit.c index d687cf4..cc85f99 100644 --- a/dinit.c +++ b/dinit.c @@ -26,7 +26,9 @@ FILE *dbfile; #ifdef unix #define TEXTFILE "/usr/games/lib/dunlib/dtextc.dat" #else /* ! unix */ - I need a definition for TEXTFILE +/* I need a definition for TEXTFILE */ +/* Defaulting to the unix location to handle the error */ +#define TEXTFILE "/usr/games/lib/dunlib/dtextc.dat" #endif /* ! unix */ #endif /* ! __AMOS__ */ #endif /* ! TEXTFILE */ @@ -43,10 +45,7 @@ FILE *dbfile; /* Read a number of two byte integers from the index file */ -static void rdints(c, pi, indxfile) -integer c; -integer *pi; -FILE *indxfile; +static void rdints( integer c, integer *pi, FILE *indxfile) { integer ch; /* Local variable for rdint */ @@ -58,10 +57,7 @@ FILE *indxfile; * pairs. */ -static void rdpartialints(c, pi, indxfile) -integer c; -integer *pi; -FILE *indxfile; +static void rdpartialints(integer c, integer *pi, FILE *indxfile) { integer ch; /* Local variable for rdint */ @@ -85,10 +81,7 @@ FILE *indxfile; /* Read a number of one byte flags from the index file */ -static void rdflags(c, pf, indxfile) -integer c; -logical *pf; -FILE *indxfile; +static void rdflags(integer c, logical *pf, FILE *indxfile) { while (c-- != 0) *pf++ = getc(indxfile); diff --git a/dmain.c b/dmain.c index 4144ff4..0d4edc2 100644 --- a/dmain.c +++ b/dmain.c @@ -10,9 +10,7 @@ #include "funcs.h" #include "vars.h" -void main(argc, argv) -int argc; -char **argv; +void main(int argc, char **argv) { /* 1) INITIALIZE DATA STRUCTURES */ /* 2) PLAY GAME */ diff --git a/dso1.c b/dso1.c index e29750e..0b41769 100644 --- a/dso1.c +++ b/dso1.c @@ -7,9 +7,7 @@ #include "funcs.h" #include "vars.h" -void princr_(full, rm) -logical full; -integer rm; +void princr_(logical full, integer rm) { /* System generated locals */ integer i__1, i__2; @@ -96,8 +94,7 @@ integer rm; /* DECLARATIONS */ -void invent_(adv) -integer adv; +void invent_(integer adv) { /* System generated locals */ integer i__1; @@ -158,9 +155,7 @@ integer adv; /* DECLARATIONS */ -void princo_(obj, desc) -integer obj; -integer desc; +void princo_(integer obj, integer desc) { /* System generated locals */ integer i__1; diff --git a/dso2.c b/dso2.c index dca841e..b35b573 100644 --- a/dso2.c +++ b/dso2.c @@ -8,9 +8,7 @@ #include "funcs.h" #include "vars.h" -logical moveto_(nr, who) -integer nr; -integer who; +logical moveto_(integer nr, integer who) { /* System generated locals */ logical ret_val; @@ -94,8 +92,7 @@ integer who; /* DECLARATIONS */ -void score_(flg) -logical flg; +void score_(logical flg) { /* Initialized data */ @@ -162,8 +159,7 @@ logical flg; /* DECLARATIONS */ -void scrupd_(n) -integer n; +void scrupd_(integer n) { if (findex_1.endgmf) { goto L100; diff --git a/dso3.c b/dso3.c index 8aa265d..d74de69 100644 --- a/dso3.c +++ b/dso3.c @@ -8,9 +8,7 @@ #include "funcs.h" #include "vars.h" -logical findxt_(dir, rm) -integer dir; -integer rm; +logical findxt_(integer dir, integer rm) { /* System generated locals */ logical ret_val; @@ -70,13 +68,7 @@ integer rm; /* DECLARATIONS */ -integer fwim_(f1, f2, rm, con, adv, nocare) -integer f1; -integer f2; -integer rm; -integer con; -integer adv; -logical nocare; +integer fwim_(integer f1, integer f2, integer rm, integer con, integer adv, logical nocare) { /* System generated locals */ integer ret_val, i__1, i__2; @@ -160,10 +152,7 @@ logical nocare; /* YES-IS-TRUE=YESNO(QUESTION,YES-STRING,NO-STRING) */ -logical yesno_(q, y, n) -integer q; -integer y; -integer n; +logical yesno_(integer q, integer y, integer n) { /* System generated locals */ logical ret_val; diff --git a/dso4.c b/dso4.c index 57f033d..8b60809 100644 --- a/dso4.c +++ b/dso4.c @@ -7,11 +7,7 @@ #include "funcs.h" #include "vars.h" -integer robadv_(adv, nr, nc, na) -integer adv; -integer nr; -integer nc; -integer na; +integer robadv_(integer adv, integer nr, integer nc, integer na) { /* System generated locals */ integer ret_val, i__1; @@ -40,12 +36,7 @@ integer na; /* DECLARATIONS */ -integer robrm_(rm, pr, nr, nc, na) -integer rm; -integer pr; -integer nr; -integer nc; -integer na; +integer robrm_(integer rm, integer pr, integer nr, integer nc, integer na) { /* System generated locals */ integer ret_val, i__1, i__2; @@ -91,9 +82,7 @@ integer na; /* DECLARATIONS */ -logical winnin_(vl, hr) -integer vl; -integer hr; +logical winnin_(integer vl, integer hr) { /* System generated locals */ logical ret_val; @@ -138,9 +127,7 @@ integer hr; /* DECLARATIONS */ -integer fights_(h, flg) -integer h; -logical flg; +integer fights_(integer h, logical flg) { /* Initialized data */ @@ -162,8 +149,7 @@ logical flg; /* DECLARATIONS */ -integer vilstr_(v) -integer v; +integer vilstr_(integer v) { /* System generated locals */ integer ret_val, i__1, i__2, i__3; diff --git a/dso5.c b/dso5.c index f360086..bc5698e 100644 --- a/dso5.c +++ b/dso5.c @@ -7,8 +7,7 @@ /* GTTIME-- GET TOTAL TIME PLAYED */ -void gttime_(t) -integer *t; +void gttime_(integer *t) { integer h, m, s; @@ -25,10 +24,7 @@ integer *t; /* DECLARATIONS */ -logical opncls_(obj, so, sc) -integer obj; -integer so; -integer sc; +logical opncls_(integer obj, integer so, integer sc) { /* System generated locals */ integer i__1; @@ -77,8 +73,7 @@ integer sc; /* DECLARATIONS */ -logical lit_(rm) -integer rm; +logical lit_(integer rm) { /* System generated locals */ integer i__1, i__2; @@ -144,10 +139,7 @@ integer rm; /* DECLARATIONS */ -integer weight_(rm, cn, ad) -integer rm; -integer cn; -integer ad; +integer weight_(integer rm, integer cn, integer ad) { /* System generated locals */ integer ret_val, i__1; diff --git a/dso6.c b/dso6.c index 0fea115..721f03d 100644 --- a/dso6.c +++ b/dso6.c @@ -7,9 +7,7 @@ #include "funcs.h" #include "vars.h" -logical ghere_(obj, rm) -integer obj; -integer rm; +logical ghere_(integer obj, integer rm) { /* System generated locals */ logical ret_val; @@ -130,8 +128,7 @@ integer rm; /* DECLARATIONS */ -integer mrhere_(rm) -integer rm; +integer mrhere_(integer rm) { /* System generated locals */ integer ret_val, i__1; diff --git a/dso7.c b/dso7.c index 00e26a7..b84b669 100644 --- a/dso7.c +++ b/dso7.c @@ -8,9 +8,7 @@ #include "funcs.h" #include "vars.h" -void encryp_(inw, outw) -const char *inw; -char *outw; +void encryp_(const char *inw, char *outw) { /* Initialized data */ @@ -62,8 +60,7 @@ char *outw; /* DECLARATIONS */ -void cpgoto_(st) -integer st; +void cpgoto_(integer st) { /* System generated locals */ integer i__1, i__2; @@ -92,9 +89,7 @@ integer st; /* DECLARATIONS */ -void cpinfo_(rmk, st) -integer rmk; -integer st; +void cpinfo_(integer rmk, integer st) { /* Initialized data */ diff --git a/dsub.c b/dsub.c index c6efcda..ada053f 100644 --- a/dsub.c +++ b/dsub.c @@ -22,8 +22,7 @@ static void rspsb2nl_ P((integer, integer, integer, logical)); /* CALL RSPEAK(MSGNUM) */ -void rspeak_(n) -integer n; +void rspeak_(integer n) { rspsb2nl_(n, 0, 0, 1); } /* rspeak_ */ @@ -34,9 +33,7 @@ integer n; /* CALL RSPSUB(MSGNUM,SUBNUM) */ -void rspsub_(n, s1) -integer n; -integer s1; +void rspsub_(integer n, integer s1) { rspsb2nl_(n, s1, 0, 1); } /* rspsub_ */ @@ -47,21 +44,14 @@ integer s1; /* CALL RSPSB2(MSGNUM,SUBNUM1,SUBNUM2) */ -void rspsb2_(n, s1, s2) -integer n; -integer s1; -integer s2; +void rspsb2_(integer n, integer s1, integer s2) { rspsb2nl_(n, s1, s2, 1); } /* rspsb2_ */ /* rspsb2nl_ Display a substitutable message with an optional newline */ -static void rspsb2nl_(n, y, z, nl) -integer n; -integer y; -integer z; -logical nl; +static void rspsb2nl_(integer n, integer y, integer z, logical nl) { const char *zkey = "IanLanceTaylorJr"; long x; @@ -167,9 +157,7 @@ logical objact_() /* CALL BUG(NO,PAR) */ -void bug_(a, b) -integer a; -integer b; +void bug_(integer a, integer b) { /* Local variables */ @@ -189,12 +177,7 @@ integer b; /* CALL NEWSTA(OBJECT,STRING,NEWROOM,NEWCON,NEWADV) */ -void newsta_(o, r, rm, cn, ad) -integer o; -integer r; -integer rm; -integer cn; -integer ad; +void newsta_(integer o, integer r, integer rm, integer cn, integer ad) { rspeak_(r); objcts_1.oroom[o - 1] = rm; @@ -206,9 +189,7 @@ integer ad; /* DECLARATIONS */ -logical qhere_(obj, rm) -integer obj; -integer rm; +logical qhere_(integer obj, integer rm) { /* System generated locals */ integer i__1; @@ -240,8 +221,7 @@ integer rm; /* DECLARATIONS */ -logical qempty_(obj) -integer obj; +logical qempty_(integer obj) { /* System generated locals */ integer i__1; @@ -268,8 +248,7 @@ integer obj; /* DECLARATIONS */ -void jigsup_(desc) -integer desc; +void jigsup_(integer desc) { /* Initialized data */ @@ -436,8 +415,7 @@ integer desc; /* DECLARATIONS */ -integer oactor_(obj) -integer obj; +integer oactor_(integer obj) { /* System generated locals */ integer ret_val = 1, i__1; @@ -465,9 +443,7 @@ integer obj; /* DECLARATIONS */ -logical prob_(g, b) -integer g; -integer b; +logical prob_(integer g, integer b) { /* System generated locals */ logical ret_val; @@ -491,8 +467,7 @@ integer b; /* RMDESC PRINTS A DESCRIPTION OF THE CURRENT ROOM. */ /* IT IS ALSO THE PROCESSOR FOR VERBS 'LOOK' AND 'EXAMINE'. */ -logical rmdesc_(full) -integer full; +logical rmdesc_(integer full) { /* System generated locals */ logical ret_val, L__1; @@ -603,8 +578,7 @@ integer full; /* DECLARATIONS */ -logical rappli_(ri) -integer ri; +logical rappli_(integer ri) { /* Initialized data */ diff --git a/dverb1.c b/dverb1.c index e6dedbd..72b6c56 100644 --- a/dverb1.c +++ b/dverb1.c @@ -9,8 +9,7 @@ /* TAKE AN OBJECT (FOR VERBS TAKE, PUT, DROP, READ, ETC.) */ -logical take_(flg) -logical flg; +logical take_(logical flg) { /* System generated locals */ integer i__1; @@ -101,8 +100,7 @@ logical flg; /* DECLARATIONS */ -logical drop_(z) -logical z; +logical drop_(logical z) { /* System generated locals */ logical ret_val; @@ -190,8 +188,7 @@ logical z; /* DECLARATIONS */ -logical put_(flg) -logical flg; +logical put_(logical flg) { /* System generated locals */ logical ret_val; @@ -331,8 +328,7 @@ logical flg; /* VALUAC- HANDLES VALUABLES/EVERYTHING */ -void valuac_(v) -integer v; +void valuac_(integer v) { /* System generated locals */ integer i__1; diff --git a/dverb2.c b/dverb2.c index ec06283..9eec639 100644 --- a/dverb2.c +++ b/dverb2.c @@ -351,8 +351,7 @@ logical walk_() /* DECLARATIONS */ -static integer cxappl_(ri) -integer ri; +static integer cxappl_(integer ri) { /* System generated locals */ integer ret_val, i__1; diff --git a/lightp.c b/lightp.c index 6cb2a94..8a4d168 100644 --- a/lightp.c +++ b/lightp.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical lightp_(obj) -integer obj; +logical lightp_(integer obj) { /* System generated locals */ logical ret_val; diff --git a/nobjs.c b/nobjs.c index b201a55..97d8f9d 100644 --- a/nobjs.c +++ b/nobjs.c @@ -11,9 +11,7 @@ static logical mirpan_ P((integer, logical)); -logical nobjs_(ri, arg) -integer ri; -integer arg; +logical nobjs_(integer ri, integer arg) { /* System generated locals */ integer i__1, i__2; @@ -855,9 +853,7 @@ integer arg; /* DECLARATIONS */ -static logical mirpan_(st, pnf) -integer st; -logical pnf; +static logical mirpan_(integer st, logical pnf) { /* System generated locals */ integer i__1; diff --git a/np.c b/np.c index a0ab931..d0fa366 100644 --- a/np.c +++ b/np.c @@ -15,9 +15,7 @@ extern int system P((const char *)); static logical lex_ P((char *, integer *, integer *, logical)); -void rdline_(buffer, who) -char *buffer; -integer who; +void rdline_(char *buffer, integer who) { /* Local variables */ char *z, *zlast; @@ -63,9 +61,7 @@ integer who; /* THIS ROUTINE DETAILS ON BIT 0 OF PRSFLG */ -logical parse_(inbuf, vbflag) -char *inbuf; -logical vbflag; +logical parse_(char *inbuf, logical vbflag) { /* System generated locals */ integer i__1; @@ -133,12 +129,7 @@ logical vbflag; /* DECLARATIONS */ -void orphan_(o1, o2, o3, o4, o5) -integer o1; -integer o2; -integer o3; -integer o4; -integer o5; +void orphan_(integer o1, integer o2, integer o3, integer o4, integer o5) { orphs_1.oflag = o1; /* !SET UP NEW ORPHANS. */ @@ -152,11 +143,7 @@ integer o5; /* THIS ROUTINE DETAILS ON BIT 1 OF PRSFLAG */ -static logical lex_(inbuf, outbuf, op, vbflag) -char *inbuf; -integer *outbuf; -integer *op; -logical vbflag; +static logical lex_(char *inbuf, integer *outbuf, integer *op, logical vbflag) { /* Initialized data */ diff --git a/np1.c b/np1.c index 5afc130..4bedcc3 100644 --- a/np1.c +++ b/np1.c @@ -15,10 +15,7 @@ /* THIS ROUTINE DETAILS ON BIT 2 OF PRSFLG */ -integer sparse_(lbuf, llnt, vbflag) -const integer *lbuf; -integer llnt; -logical vbflag; +integer sparse_(const integer *lbuf, integer llnt, logical vbflag) { /* Initialized data */ diff --git a/np2.c b/np2.c index ddca733..75856cb 100644 --- a/np2.c +++ b/np2.c @@ -12,10 +12,7 @@ static logical thisit_ P((integer, integer, integer, integer)); /* THIS ROUTINE DETAILS ON BIT 3 OF PRSFLG */ -integer getobj_(oidx, aidx, spcobj) -integer oidx; -integer aidx; -integer spcobj; +integer getobj_(integer oidx, integer aidx, integer spcobj) { /* System generated locals */ integer ret_val, i__1; @@ -148,13 +145,7 @@ integer spcobj; /* DECLARATIONS */ -integer schlst_(oidx, aidx, rm, cn, ad, spcobj) -integer oidx; -integer aidx; -integer rm; -integer cn; -integer ad; -integer spcobj; +integer schlst_(integer oidx, integer aidx, integer rm, integer cn, integer ad, integer spcobj) { /* System generated locals */ integer ret_val, i__1, i__2; @@ -252,11 +243,7 @@ integer spcobj; /* DECLARATIONS */ -static logical thisit_(oidx, aidx, obj, spcobj) -integer oidx; -integer aidx; -integer obj; -integer spcobj; +static logical thisit_(integer oidx, integer aidx, integer obj, integer spcobj) { /* Initialized data */ diff --git a/np3.c b/np3.c index 414f6b0..e60255b 100644 --- a/np3.c +++ b/np3.c @@ -206,9 +206,7 @@ logical synmch_() /* DECLARATIONS */ -static void unpack_(oldj, j) -integer oldj; -integer *j; +static void unpack_(integer oldj, integer *j) { /* Local variables */ integer i; @@ -272,12 +270,7 @@ integer *j; /* DECLARATIONS */ -static logical syneql_(prep, obj, sprep, sfl1, sfl2) -integer prep; -integer obj; -integer sprep; -integer sfl1; -integer sfl2; +static logical syneql_(integer prep, integer obj, integer sprep, integer sfl1, integer sfl2) { /* System generated locals */ logical ret_val; @@ -300,9 +293,7 @@ integer sfl2; /* DECLARATIONS */ -static logical takeit_(obj, sflag) -integer obj; -integer sflag; +static logical takeit_(integer obj, integer sflag) { /* System generated locals */ logical ret_val; @@ -419,10 +410,7 @@ integer sflag; /* DECLARATIONS */ -static integer gwim_(sflag, sfw1, sfw2) -integer sflag; -integer sfw1; -integer sfw2; +static integer gwim_(integer sflag, integer sfw1, integer sfw2) { /* System generated locals */ integer ret_val; diff --git a/nrooms.c b/nrooms.c index 01c907d..4b7bf33 100644 --- a/nrooms.c +++ b/nrooms.c @@ -10,8 +10,7 @@ static void ewtell_ P((integer, integer)); static void lookto_ P((integer, integer, integer, integer, integer)); -logical rappl2_(ri) -integer ri; +logical rappl2_(integer ri) { /* Initialized data */ @@ -409,12 +408,7 @@ integer ri; /* DECLARATIONS */ -static void lookto_(nrm, srm, nt, st, ht) -integer nrm; -integer srm; -integer nt; -integer st; -integer ht; +static void lookto_(integer nrm, integer srm, integer nt, integer st, integer ht) { /* System generated locals */ integer i__1; @@ -492,9 +486,7 @@ integer ht; /* DECLARATIONS */ -static void ewtell_(rm, st) -integer rm; -integer st; +static void ewtell_(integer rm, integer st) { /* System generated locals */ integer i__1; diff --git a/objcts.c b/objcts.c index 2447392..2380766 100644 --- a/objcts.c +++ b/objcts.c @@ -7,9 +7,7 @@ #include "funcs.h" #include "vars.h" -logical oappli_(ri, arg) -integer ri; -integer arg; +logical oappli_(integer ri, integer arg) { /* Initialized data */ diff --git a/rooms.c b/rooms.c index 723ba54..6a6fea6 100644 --- a/rooms.c +++ b/rooms.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical rappl1_(ri) -integer ri; +logical rappl1_(integer ri) { /* System generated locals */ integer i__1, i__2; diff --git a/sobjs.c b/sobjs.c index 0cadc0b..782f13c 100644 --- a/sobjs.c +++ b/sobjs.c @@ -9,9 +9,7 @@ #include "funcs.h" #include "vars.h" -logical sobjs_(ri, arg) -integer ri; -integer arg; +logical sobjs_(integer ri, integer arg) { /* System generated locals */ integer i__1; diff --git a/supp.c b/supp.c index ef9a62a..432cc08 100644 --- a/supp.c +++ b/supp.c @@ -38,10 +38,7 @@ void exit_() /* Get time in hours, minutes and seconds */ -void itime_(hrptr, minptr, secptr) -integer *hrptr; -integer *minptr; -integer *secptr; +void itime_(integer *hrptr, integer *minptr, integer *secptr) { time_t timebuf; struct tm *tmptr; @@ -55,8 +52,7 @@ integer *secptr; } /* Random number generator */ -integer rnd_(maxval) -integer maxval; +integer rnd_(integer maxval) { return rand() % maxval; } @@ -204,8 +200,7 @@ void more_init() * probably don't). */ -void more_output(z) -const char *z; +void more_output(const char *z) { /* pager code remarked out to allow streamed input and output */ /* diff --git a/sverbs.c b/sverbs.c index 6a8d44a..3e2cc92 100644 --- a/sverbs.c +++ b/sverbs.c @@ -10,8 +10,7 @@ #include "funcs.h" #include "vars.h" -logical sverbs_(ri) -integer ri; +logical sverbs_(integer ri) { /* Initialized data */ diff --git a/verbs.c b/verbs.c index d368c4c..62b3187 100644 --- a/verbs.c +++ b/verbs.c @@ -7,8 +7,7 @@ #include "funcs.h" #include "vars.h" -logical vappli_(ri) -integer ri; +logical vappli_(integer ri) { /* Initialized data */ From 9d03f188882ab9a930f5cba4416f01b00211ec96 Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:26:56 -0800 Subject: [PATCH 3/8] fixed a function definition without a prototype is deprecated in all versions of C and is not supported in C23 --- clockr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clockr.c b/clockr.c index dfa4efc..04803c6 100644 --- a/clockr.c +++ b/clockr.c @@ -10,8 +10,7 @@ static void litint_ P((integer, integer *, integer, const integer *, integer)); -void cevapp_(ri) -integer ri; +void cevapp_(integer ri) { /* Initialized data */ From 11a060688ec05260012675a3e6bfdcbc33f6f71b Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:34:34 -0800 Subject: [PATCH 4/8] Standardized the return type of main --- dmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmain.c b/dmain.c index 0d4edc2..0091820 100644 --- a/dmain.c +++ b/dmain.c @@ -10,7 +10,7 @@ #include "funcs.h" #include "vars.h" -void main(int argc, char **argv) +int main(int argc, char **argv) { /* 1) INITIALIZE DATA STRUCTURES */ /* 2) PLAY GAME */ From 36af0f24bf4587925ec7a0ee1e5b5fef3dc9982e Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:35:33 -0800 Subject: [PATCH 5/8] Fixed the return type --- dmain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dmain.c b/dmain.c index 0091820..8e4a4e2 100644 --- a/dmain.c +++ b/dmain.c @@ -20,5 +20,6 @@ int main(int argc, char **argv) } /* !IF INIT, PLAY GAME. */ exit_(); + return 0; /* !DONE */ -} /* MAIN__ */ +} /* MAIN__ */ \ No newline at end of file From 94c58860f0046d83224fea4fbdbe4599945791d6 Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:44:35 -0800 Subject: [PATCH 6/8] fixed format specifies type 'int' but the argument has type 'long' --- dsub.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dsub.c b/dsub.c index ada053f..c1ea549 100644 --- a/dsub.c +++ b/dsub.c @@ -71,7 +71,7 @@ static void rspsb2nl_(integer n, integer y, integer z, logical nl) x = ((- x) - 1) * 8; if (fseek(dbfile, x + (long)rmsg_1.mrloc, SEEK_SET) == EOF) { - fprintf(stderr, "Error seeking database loc %d\n", x); + fprintf(stderr, "Error seeking database loc %ld\n", x); exit_(); } @@ -83,7 +83,7 @@ static void rspsb2nl_(integer n, integer y, integer z, logical nl) i = getc(dbfile); if (i == EOF) { - fprintf(stderr, "Error reading database loc %d\n", x); + fprintf(stderr, "Error reading database loc %ld\n", x); exit_(); } i ^= zkey[x & 0xf] ^ (x & 0xff); @@ -101,7 +101,7 @@ static void rspsb2nl_(integer n, integer y, integer z, logical nl) iloc = ftell(dbfile); rspsb2nl_(y, 0, 0, 0); if (fseek(dbfile, iloc, SEEK_SET) == EOF) { - fprintf(stderr, "Error seeking database loc %d\n", iloc); + fprintf(stderr, "Error seeking database loc %ld\n", iloc); exit_(); } y = z; From 32c28b6774850b16511a0ee0a12cf69f64522abb Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 12:54:49 -0800 Subject: [PATCH 7/8] fixed an uncommented comment --- supp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supp.c b/supp.c index 432cc08..4acca4f 100644 --- a/supp.c +++ b/supp.c @@ -184,7 +184,7 @@ void more_init() #else /* ! MORE_AMOS */ - This should be impossible + /* This should be impossible */ #endif /* ! MORE_AMOS */ #endif /* ! MORE_TERMINFO */ From 7bf8111f970bb70d9fec1c740f02e8e813fc8f92 Mon Sep 17 00:00:00 2001 From: Tod Bookless Date: Thu, 4 Dec 2025 13:03:25 -0800 Subject: [PATCH 8/8] Included a missing library --- local.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/local.c b/local.c index c205c5c..a645041 100644 --- a/local.c +++ b/local.c @@ -1,6 +1,8 @@ /* local.c -- dungeon functions which need local definition */ #include "funcs.h" +/* unistd.h needed for getuid() */ +#include #ifdef __AMOS__ #include