From 691645d048bebe26f109d0c7790adcdf3e988192 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 28 May 2017 15:08:42 -0700 Subject: [PATCH] Fix missing return types on functions, convert some functions with always ignored results to void. --- inc/lispemul.h | 5 +-- src/array.c | 2 +- src/array2.c | 2 +- src/array3.c | 2 +- src/array4.c | 2 +- src/array5.c | 2 +- src/array6.c | 2 +- src/bbtsub.c | 80 +++++++++++++++++++++-------------------- src/bin.c | 2 +- src/byteswap.c | 4 +-- src/chardev.c | 14 ++++---- src/common.c | 6 ++-- src/conspage.c | 22 ++++++------ src/dbgtool.c | 39 +++++++++++--------- src/dir.c | 44 +++++++++++------------ src/dsk.c | 52 +++++++++++++-------------- src/dspif.c | 4 +-- src/dspsubrs.c | 16 ++++----- src/eqf.c | 8 ++--- src/ether.c | 46 ++++++++++++------------ src/fp.c | 10 +++--- src/fvar.c | 2 +- src/gc2.c | 4 +-- src/gcarray.c | 1 + src/gccode.c | 5 +-- src/gcfinal.c | 6 ++-- src/gchtfind.c | 2 +- src/gcmain3.c | 8 ++--- src/gcoflow.c | 4 +-- src/gcr.c | 10 +++--- src/gcrcell.c | 5 +-- src/hardrtn.c | 2 +- src/inet.c | 2 +- src/initkbd.c | 12 ++++--- src/initsout.c | 17 +++++---- src/kbdsubrs.c | 14 +++----- src/keyevent.c | 9 ++--- src/keylib.c | 2 +- src/keymaker.c | 5 +-- src/keytstno.c | 2 +- src/kprint.c | 14 +++++--- src/ldeether.c | 8 ++--- src/ldsout.c | 2 +- src/lisp2c.c | 2 +- src/llcolor.c | 21 ++++++----- src/llstk.c | 8 ++--- src/loopsops.c | 4 +-- src/lowlev2.c | 4 +-- src/main.c | 13 ++++--- src/misc7.c | 2 +- src/mkatom.c | 12 +++---- src/mkvdate.c | 8 ++--- src/mvs.c | 6 ++-- src/osmsg.c | 46 +++++++++--------------- src/perrno.c | 4 +-- src/return.c | 2 +- src/rpc.c | 2 +- src/rplcons.c | 2 +- src/setsout.c | 39 ++++++++++---------- src/shift.c | 15 +++++--- src/storage.c | 42 ++++++++++++---------- src/subr0374.c | 11 ++++-- src/sxhash.c | 25 ++++++++----- src/testtool.c | 18 +++++----- src/timer.c | 18 +++++----- src/tstsout.c | 25 ++++++------- src/ubf1.c | 2 +- src/ubf2.c | 2 +- src/ubf3.c | 2 +- src/ufs.c | 29 ++++++++------- src/unixcomm.c | 18 ++++------ src/uraid.c | 18 ++++++---- src/usrsubr.c | 4 +-- src/uutils.c | 12 +++---- src/vmemsave.c | 12 +++---- src/xbbt.c | 2 +- src/xc.c | 4 +-- src/xcursor.c | 16 +++++---- src/xlspwin.c | 8 ++--- src/xmkicon.c | 2 +- src/xrdopt.c | 96 ++++++++++++++++++++++++-------------------------- src/xscroll.c | 74 +++++++++++++++++++------------------- src/z2.c | 6 ++-- 83 files changed, 587 insertions(+), 549 deletions(-) diff --git a/inc/lispemul.h b/inc/lispemul.h index b72494a..ef425e8 100755 --- a/inc/lispemul.h +++ b/inc/lispemul.h @@ -26,7 +26,7 @@ typedef char DLbyte; typedef unsigned int LispPTR; /* 32 bit Cell Chang. 14 Jan 87 take */ typedef DLword mds_page; /* Top word of the MDS */ -typedef (*CFuncPTR)(); +typedef int (*CFuncPTR)(); #ifdef BIGVM typedef struct consstr @@ -184,7 +184,7 @@ typedef char DLbyte; typedef unsigned int LispPTR; /* 32 bit Cell Chang. 14 Jan 87 take */ typedef DLword mds_page; /* Top word of the MDS */ -typedef (*CFuncPTR)(); +typedef int (*CFuncPTR)(); #ifdef BIGVM typedef struct consstr @@ -473,6 +473,7 @@ extern DLword *createcell68k(unsigned int type); extern LispPTR *alloc_mdspage(register short int type); extern UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep); extern char *getenv(const char *); +extern int error(char *); #include diff --git a/src/array.c b/src/array.c index 20a34ce..6e534b9 100755 --- a/src/array.c +++ b/src/array.c @@ -49,7 +49,7 @@ type size typenumber ***********************************************************/ /*** N_OP_misc3 -- op 372/9 (base typenumber index) ***/ -N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha) +LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha) { register int result; register int index, type; diff --git a/src/array2.c b/src/array2.c index 5acda03..0ece787 100755 --- a/src/array2.c +++ b/src/array2.c @@ -49,7 +49,7 @@ static char *id = "@(#) array2.c 2.9 10/12/88"; /* */ /************************************************************************/ -N_OP_misc4(register LispPTR data, register LispPTR base, register LispPTR typenumber, register LispPTR inx, int alpha) +LispPTR N_OP_misc4(register LispPTR data, register LispPTR base, register LispPTR typenumber, register LispPTR inx, int alpha) { register int new; register int index; diff --git a/src/array3.c b/src/array3.c index 505c82a..2643dce 100755 --- a/src/array3.c +++ b/src/array3.c @@ -39,7 +39,7 @@ static char *id = "@(#) array3.c 2.9 10/12/88"; #include "my.h" /*** N_OP_aref1 -- op 266 (array index) ***/ -N_OP_aref1(register LispPTR arrayarg, register LispPTR inx) +LispPTR N_OP_aref1(register LispPTR arrayarg, register LispPTR inx) { register LispPTR baseL; diff --git a/src/array4.c b/src/array4.c index 1cc107c..fc641f2 100755 --- a/src/array4.c +++ b/src/array4.c @@ -51,7 +51,7 @@ static char *id = "@(#) array4.c 2.7 10/12/88"; /* */ /************************************************************************/ -N_OP_aset1(register LispPTR data, LispPTR arrayarg, register int inx) +LispPTR N_OP_aset1(register LispPTR data, LispPTR arrayarg, register int inx) { register int type; register OneDArray *arrayblk; diff --git a/src/array5.c b/src/array5.c index bd30fc0..b6f3c7d 100755 --- a/src/array5.c +++ b/src/array5.c @@ -50,7 +50,7 @@ static char *id = "@(#) array5.c 2.7 10/12/88"; /* */ /************************************************************************/ -N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1) +LispPTR N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1) { #define REG LispPTR baseL; diff --git a/src/array6.c b/src/array6.c index bd6bb33..3d488a6 100755 --- a/src/array6.c +++ b/src/array6.c @@ -33,7 +33,7 @@ static char *id = "@(#) array6.c 2.10 4/21/92"; #include "my.h" /*** N_OP_aset2 -- op 357 (new-value array index0 index1) ***/ -N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1) +LispPTR N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1) { register int type; diff --git a/src/bbtsub.c b/src/bbtsub.c index 4dfcb1d..15565b4 100644 --- a/src/bbtsub.c +++ b/src/bbtsub.c @@ -1865,6 +1865,47 @@ typedef struct { /** changecharset_display,sfffixy are not tested *****I don't use TAKE **/ +LispPTR sfffixy(displaydata68k, csinfo68k, pbt68k) +DISPLAYDATA *displaydata68k; +CHARSETINFO *csinfo68k; +PILOTBBT *pbt68k; + +{ + int y; + int chartop, top; + BITMAP *bm68k; + register LispPTR base, ypos, yoff; + + FGetNum2(displaydata68k->ddyoffset, yoff); + FGetNum2(displaydata68k->ddyposition, ypos); + + y = ypos + yoff; + + displaydata68k->ddcharsetascent = csinfo68k->CHARSETASCENT; + chartop = y + displaydata68k->ddcharsetascent; + + bm68k = (BITMAP *)Addr68k_from_LADDR(displaydata68k->dddestination); + base = bm68k->bmbase; + top = IMAX(IMIN(displaydata68k->ddclippingtop, chartop), 0); + base = base + (bm68k->bmrasterwidth * (bm68k->bmheight - top)); + pbt68k->pbtdesthi = base >> 16; + pbt68k->pbtdestlo = base; + + bm68k = (BITMAP *)Addr68k_from_LADDR(csinfo68k->CHARSETBITMAP); + base = bm68k->bmbase; + displaydata68k->ddcharheightdelta = IMIN(IMAX(chartop - top, 0), 65535); /* always positive */ + base = base + bm68k->bmrasterwidth * displaydata68k->ddcharheightdelta; + pbt68k->pbtsourcehi = base >> 16; + pbt68k->pbtsourcelo = base; + + displaydata68k->ddcharsetdescent = csinfo68k->CHARSETDESCENT; + + pbt68k->pbtheight = + IMAX(0, top - (IMAX(y - displaydata68k->ddcharsetdescent, displaydata68k->ddclippingbottom))); + return (T); + +} /* sfffixy */ + LispPTR changecharset_display(register DISPLAYDATA *displaydata68k, DLword charset) { register PILOTBBT *pbt68k; register FONTDESC *fontd68k; @@ -1908,45 +1949,6 @@ LispPTR changecharset_display(register DISPLAYDATA *displaydata68k, DLword chars } } /* changecharset_display */ -sfffixy(displaydata68k, csinfo68k, pbt68k) DISPLAYDATA *displaydata68k; -CHARSETINFO *csinfo68k; -PILOTBBT *pbt68k; - -{ - int y; - int chartop, top; - BITMAP *bm68k; - register LispPTR base, ypos, yoff; - - FGetNum2(displaydata68k->ddyoffset, yoff); - FGetNum2(displaydata68k->ddyposition, ypos); - - y = ypos + yoff; - - displaydata68k->ddcharsetascent = csinfo68k->CHARSETASCENT; - chartop = y + displaydata68k->ddcharsetascent; - - bm68k = (BITMAP *)Addr68k_from_LADDR(displaydata68k->dddestination); - base = bm68k->bmbase; - top = IMAX(IMIN(displaydata68k->ddclippingtop, chartop), 0); - base = base + (bm68k->bmrasterwidth * (bm68k->bmheight - top)); - pbt68k->pbtdesthi = base >> 16; - pbt68k->pbtdestlo = base; - - bm68k = (BITMAP *)Addr68k_from_LADDR(csinfo68k->CHARSETBITMAP); - base = bm68k->bmbase; - displaydata68k->ddcharheightdelta = IMIN(IMAX(chartop - top, 0), 65535); /* always positive */ - base = base + bm68k->bmrasterwidth * displaydata68k->ddcharheightdelta; - pbt68k->pbtsourcehi = base >> 16; - pbt68k->pbtsourcelo = base; - - displaydata68k->ddcharsetdescent = csinfo68k->CHARSETDESCENT; - - pbt68k->pbtheight = - IMAX(0, top - (IMAX(y - displaydata68k->ddcharsetdescent, displaydata68k->ddclippingbottom))); - return (T); - -} /* sfffixy */ /******************************************************************/ diff --git a/src/bin.c b/src/bin.c index a6e19be..fa88cde 100755 --- a/src/bin.c +++ b/src/bin.c @@ -47,7 +47,7 @@ static char *id = "$Id: bin.c,v 1.3 1999/05/31 23:35:24 sybalsky Exp $ Copyright #include "cell.h" #include "stream.h" -N_OP_bin(register int tos) +LispPTR N_OP_bin(register int tos) { register Stream *stream68k; /* stream instance on TOS */ register char *buff68k; /* pointer to BUFF */ diff --git a/src/byteswap.c b/src/byteswap.c index a76d67f..2615e17 100755 --- a/src/byteswap.c +++ b/src/byteswap.c @@ -91,7 +91,7 @@ unsigned int word_swap_longword(word) /* This does NOT swap words in a long-word! */ /* */ /****************************************************************/ -byte_swap_page(short unsigned int *page, int wordcount) +void byte_swap_page(short unsigned int *page, int wordcount) { int i; for (i = 0; i < wordcount; i++) @@ -188,7 +188,7 @@ void word_swap_page(short unsigned int *page, int longwordcount) ******/ #define reverse_bits(word) ((reversedbits[((word)>>8) & 0xFF] <<8) | reversedbits[(word) & 0xff]) -bit_reverse_region(register short unsigned int *top, int width, int height, int rasterwidth) +void bit_reverse_region(register short unsigned int *top, int width, int height, int rasterwidth) { register int i, j, wordwid = ((width+31)>>5)<<1; register unsigned short *word; diff --git a/src/chardev.c b/src/chardev.c index c30a207..452b133 100755 --- a/src/chardev.c +++ b/src/chardev.c @@ -90,7 +90,7 @@ extern int Dummy_errno; /* */ /************************************************************************/ -CHAR_openfile(args) +LispPTR CHAR_openfile(args) register LispPTR *args; /* args[0] fullname */ /* args[1] access */ @@ -178,7 +178,7 @@ CHAR_openfile(args) /* */ /************************************************************************/ -CHAR_closefile(args) +LispPTR CHAR_closefile(args) register LispPTR *args; /* args[0] id */ /* args[1] errno */ @@ -231,7 +231,7 @@ CHAR_closefile(args) /* */ /************************************************************************/ -CHAR_ioctl(args) +LispPTR CHAR_ioctl(args) LispPTR *args; { #ifndef DOS @@ -269,7 +269,7 @@ CHAR_ioctl(args) /* */ /************************************************************************/ -CHAR_bin(id, errn) +LispPTR CHAR_bin(id, errn) register int id; register LispPTR errn; { @@ -308,7 +308,7 @@ CHAR_bin(id, errn) /* */ /************************************************************************/ -CHAR_bout(id, ch, errn) +LispPTR CHAR_bout(id, ch, errn) register int id; register LispPTR ch, errn; { @@ -360,7 +360,7 @@ CHAR_bout(id, ch, errn) /* */ /************************************************************************/ -CHAR_bins(args) +LispPTR CHAR_bins(args) register LispPTR *args; { #ifndef DOS @@ -418,7 +418,7 @@ CHAR_bins(args) /* */ /************************************************************************/ -CHAR_bouts(args) +LispPTR CHAR_bouts(args) register LispPTR *args; { #ifndef DOS diff --git a/src/common.c b/src/common.c index af55a80..1ed33d1 100755 --- a/src/common.c +++ b/src/common.c @@ -86,7 +86,7 @@ extern int FrameBufferFd; /************************************************************************/ #define URMAXCOMM 512 -void error(char *cp) +int error(char *cp) { char *ptr; if(device_before_raid()<0) @@ -140,7 +140,7 @@ uraidloop: fflush(stdin); goto uraidloop; } - return; + return (0); } @@ -172,7 +172,7 @@ stackcheck 2.if overflow, return T (not 0). Otherwise, return F (0). ******************************************************************/ -stackcheck() +int stackcheck() { #ifdef TRACE2 printf("TRACE:stackcheck()\n"); diff --git a/src/conspage.c b/src/conspage.c index 5712454..deb18d0 100755 --- a/src/conspage.c +++ b/src/conspage.c @@ -315,17 +315,6 @@ ConsCell * find_free_cons_cell(void) -/**********************************************************************/ -/* function cons same as N_OP_cons */ -/**********************************************************************/ - -cons(LispPTR cons_car, LispPTR cons_cdr) -{ - return(N_OP_cons(cons_car, cons_cdr)); - } - - - /**********************************************************************/ /* Func name :N_OP_cons @@ -337,7 +326,7 @@ cons(LispPTR cons_car, LispPTR cons_cdr) */ /**********************************************************************/ -N_OP_cons(register int cons_car, register int cons_cdr) +LispPTR N_OP_cons(register int cons_car, register int cons_cdr) { extern struct dtd *ListpDTD ; @@ -494,3 +483,12 @@ N_OP_cons(register int cons_car, register int cons_cdr) return(new_page); } /* N_OP_cons() end */ + +/**********************************************************************/ +/* function cons same as N_OP_cons */ +/**********************************************************************/ + +LispPTR cons(LispPTR cons_car, LispPTR cons_cdr) +{ + return(N_OP_cons(cons_car, cons_cdr)); +} diff --git a/src/dbgtool.c b/src/dbgtool.c index e294a38..37fe80d 100755 --- a/src/dbgtool.c +++ b/src/dbgtool.c @@ -284,10 +284,10 @@ LispPTR get_fn_fvar_name(struct fnhead *fnobj, DLword offset) LispPTR get_fvar_name(struct frameex1 *fx_addr68k, DLword offset) { #ifdef BIGVM - get_fn_fvar_name((struct fnhead *)Addr68k_from_LADDR((fx_addr68k)->fnheader), offset); + return (get_fn_fvar_name((struct fnhead *)Addr68k_from_LADDR((fx_addr68k)->fnheader), offset)); #else - get_fn_fvar_name( - (struct fnhead *)Addr68k_from_LADDR(((int)(fx_addr68k)->hi2fnheader << 16) | (fx_addr68k)->lofnheader), offset); + return (get_fn_fvar_name( + (struct fnhead *)Addr68k_from_LADDR(((int)(fx_addr68k)->hi2fnheader << 16) | (fx_addr68k)->lofnheader), offset)); #endif /* BIGVM */ }/* end get_fvar_name */ @@ -304,7 +304,7 @@ LispPTR get_fvar_name(struct frameex1 *fx_addr68k, DLword offset) /* */ /************************************************************************/ -sf(struct frameex1 *fx_addr68k) +int sf(struct frameex1 *fx_addr68k) { Bframe *bf; DLword *next68k ; @@ -596,13 +596,7 @@ sf(struct frameex1 *fx_addr68k) /* */ /************************************************************************/ -bt(void) -{ - bt1(CURRENTFX); - } - - -bt1(FX *startFX) +void bt1(FX *startFX) { FX *fx ; struct fnhead *fnobj; @@ -664,6 +658,12 @@ bt1_exit: URaid_ArrMAXIndex=fnum-1; URaid_currentFX=0; }/* end bt */ +void bt(void) +{ + bt1(CURRENTFX); + } + + @@ -691,7 +691,7 @@ bt1_exit: URaid_ArrMAXIndex=fnum-1; /* */ /************************************************************************/ -btvv(void) +void btvv(void) { struct frameex1 *fx_addr68k; LispPTR atomindex ; @@ -730,7 +730,7 @@ btvv(void) /* NMitani */ /************************************************************************/ -sff(LispPTR laddr) +void sff(LispPTR laddr) { sf((FX *)Addr68k_from_LADDR(laddr)); } @@ -744,7 +744,12 @@ sff(LispPTR laddr) /*****************************************************************/ #define DUMPSIZE 40 #define FNOVERHEADWORDS (8) -void nt(LispPTR index) + +void nt1(LispPTR *start, int size, char *str); + +void ntheader(struct fnhead *fnobj); + + void nt(LispPTR index) /* atom index */ { struct fnhead *fnobj; @@ -779,7 +784,7 @@ void nt(LispPTR index) ntheader(fnobj); } -ntheader(struct fnhead *fnobj) +void ntheader(struct fnhead *fnobj) { LispPTR *localnt1; int localntsize; @@ -805,7 +810,7 @@ ntheader(struct fnhead *fnobj) } -nts(struct frameex1 *fxp) +void nts(struct frameex1 *fxp) { struct fnhead *nt; @@ -833,7 +838,7 @@ nts(struct frameex1 *fxp) #define VAROFFSET(X) (X & 0xFFFFFFF) -nt1(LispPTR *start, int size, char *str) +void nt1(LispPTR *start, int size, char *str) { LispPTR *endp, *entry2p; diff --git a/src/dir.c b/src/dir.c index 3d32183..7171df3 100755 --- a/src/dir.c +++ b/src/dir.c @@ -200,7 +200,7 @@ extern int Dummy_errno; * number of characters. */ -match_pattern(tp, pp) +int match_pattern(tp, pp) register char *tp; register char *pp; { @@ -378,7 +378,7 @@ unsigned MAXFINFO; */ #ifdef FSDEBUG -print_finfo(fp) +void print_finfo(fp) FINFO *fp; { FINFO *sp; @@ -414,7 +414,7 @@ print_finfo(fp) * This routine is invoked at very first stage of emulator start up. */ -init_finfo() +int init_finfo() { register FINFO *cp; register int n; @@ -465,7 +465,7 @@ init_finfo() * FINFOARRAYRSIZE. */ -get_finfo_id() +int get_finfo_id() { register int i; DFINFO *dfap; @@ -512,7 +512,7 @@ get_finfo_id() */ #ifdef DOS -enum_dsk_prop(dir, name, ver, finfo_buf) +int enum_dsk_prop(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -678,7 +678,7 @@ enum_dsk_prop(dir, name, ver, finfo_buf) return(n); } #else /* DOS */ -enum_dsk_prop(dir, name, ver, finfo_buf) +int enum_dsk_prop(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -803,7 +803,7 @@ enum_dsk_prop(dir, name, ver, finfo_buf) * Similar to enum_dsk_prop, but file properties are not stored. */ #ifdef DOS -enum_dsk(dir, name, ver, finfo_buf) +int enum_dsk(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -953,7 +953,7 @@ enum_dsk(dir, name, ver, finfo_buf) #else /* DOS */ -enum_dsk(dir, name, ver, finfo_buf) +int enum_dsk(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -1067,7 +1067,7 @@ enum_dsk(dir, name, ver, finfo_buf) * of FINFO structures. */ #ifdef DOS -enum_ufs_prop(dir, name, ver, finfo_buf) +int enum_ufs_prop(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -1158,7 +1158,7 @@ enum_ufs_prop(dir, name, ver, finfo_buf) return(n); } #else /* DOS */ -enum_ufs_prop(dir, name, ver, finfo_buf) +int enum_ufs_prop(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -1277,7 +1277,7 @@ enum_ufs_prop(dir, name, ver, finfo_buf) * Similar to enum_ufs_prop, but file properties are not stored. */ #ifdef DOS -enum_ufs(dir, name, ver, finfo_buf) +int enum_ufs(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -1352,7 +1352,7 @@ enum_ufs(dir, name, ver, finfo_buf) return(n); } #else /* DOS */ -enum_ufs(dir, name, ver, finfo_buf) +int enum_ufs(dir, name, ver, finfo_buf) char *dir; char *name; char *ver; @@ -1455,7 +1455,7 @@ enum_ufs(dir, name, ver, finfo_buf) * This routine is only used by DSK codes. */ -trim_finfo(fp) +int trim_finfo(fp) FINFO **fp; { #ifndef DOS @@ -1584,7 +1584,7 @@ trim_finfo(fp) * of. */ -trim_finfo_highest(fp, highestp) +int trim_finfo_highest(fp, highestp) FINFO **fp; int highestp; { @@ -1726,7 +1726,7 @@ trim_finfo_highest(fp, highestp) * are got rid of. */ -trim_finfo_version(fp, rver) +int trim_finfo_version(fp, rver) FINFO **fp; int rver; { @@ -1958,7 +1958,7 @@ prepare_sort_buf(fp, n) * Note that the result is in the reversed order. */ -dsk_filecmp(fp1, fp2) +int dsk_filecmp(fp1, fp2) FINFO **fp1; FINFO **fp2; { @@ -1992,7 +1992,7 @@ dsk_filecmp(fp1, fp2) * Note that the result is in the reversed order. */ -unix_filecmp(f1, f2) +int unix_filecmp(f1, f2) register FINFO **f1; register FINFO **f2; { @@ -2018,7 +2018,7 @@ unix_filecmp(f1, f2) * used for {DSK} and {UNIX} device respectively as a sort function. */ -file_sort(fpp, n, sortfn) +int file_sort(fpp, n, sortfn) register FINFO **fpp; register int n; register int (*sortfn)(); @@ -2156,7 +2156,7 @@ typedef struct ufsgfs { * Enumerates files matching pattern. */ -COM_gen_files(args) +LispPTR COM_gen_files(args) register LispPTR *args; { char fbuf[MAXPATHLEN + 5], dir[MAXPATHLEN], pattern[MAXPATHLEN]; @@ -2318,7 +2318,7 @@ COM_gen_files(args) * name. */ -COM_next_file(args) +LispPTR COM_next_file(args) register LispPTR *args; { register LispPTR laddr; @@ -2393,12 +2393,12 @@ COM_next_file(args) * Abandon all cached information corresponding to the generator. */ -COM_finish_finfo(args) +LispPTR COM_finish_finfo(args) register LispPTR *args; { register DFINFO *dfp; register FINFO *fp; - register finfoid; + register int finfoid; ERRSETJMP(NIL); diff --git a/src/dsk.c b/src/dsk.c index c8caf3b..b170a20 100755 --- a/src/dsk.c +++ b/src/dsk.c @@ -285,7 +285,7 @@ void separate_host(lfname, host) * open a specified file. */ -COM_openfile(args) +LispPTR COM_openfile(args) register LispPTR *args; { char lfname[MAXPATHLEN + 5], file[MAXPATHLEN], host[MAXNAMLEN]; @@ -640,7 +640,7 @@ COM_openfile(args) * Lisp and it is passed to COM_closefile. */ -COM_closefile(args) +LispPTR COM_closefile(args) register LispPTR *args; { @@ -943,7 +943,7 @@ COM_closefile(args) * can open the file with the specified mode or not. */ -DSK_getfilename(args) +LispPTR DSK_getfilename(args) register LispPTR *args; { register char *base; @@ -1247,7 +1247,7 @@ DSK_getfilename(args) * a specified file. */ -DSK_deletefile(args) +LispPTR DSK_deletefile(args) register LispPTR *args; { char file[MAXPATHLEN], fbuf[MAXPATHLEN], vless[MAXPATHLEN]; @@ -1398,7 +1398,7 @@ DSK_deletefile(args) * a specified file. */ -DSK_renamefile(args) +LispPTR DSK_renamefile(args) register LispPTR *args; { char src[MAXPATHLEN], dst[MAXPATHLEN]; @@ -1630,7 +1630,7 @@ DSK_renamefile(args) * the directory name representation. */ -DSK_directorynamep(args) +LispPTR DSK_directorynamep(args) register LispPTR *args; { char dirname[MAXPATHLEN]; @@ -1720,7 +1720,7 @@ DSK_directorynamep(args) * Lisp sense. */ -COM_getfileinfo(args) +LispPTR COM_getfileinfo(args) register LispPTR *args; { register int dskp, rval; @@ -1929,7 +1929,7 @@ COM_getfileinfo(args) * make sense. */ -COM_setfileinfo(args) +LispPTR COM_setfileinfo(args) register LispPTR *args; { register int dskp, rval, date; @@ -2073,7 +2073,7 @@ COM_setfileinfo(args) * remaining region of a buffer will be zero outed. The size of a page is 512 bytes. */ -COM_readpage(args) +LispPTR COM_readpage(args) register LispPTR *args; { register char *bufp; @@ -2159,7 +2159,7 @@ rdlp: TIMEOUT(count = read(fd, bufp, FDEV_PAGE_SIZE)); * The actual size of data written is specified with args[3]. */ -COM_writepage(args) +LispPTR COM_writepage(args) register LispPTR *args; { register int fd; @@ -2237,7 +2237,7 @@ wlp: TIMEOUT(rval = write(fd, bufp, count)); * truncate a file. */ -COM_truncatefile(args) +LispPTR COM_truncatefile(args) register LispPTR *args; { register int fd; @@ -2321,7 +2321,7 @@ COM_truncatefile(args) * Change the current directory of the process to the specified directory. */ -COM_changedir(args) +LispPTR COM_changedir(args) register LispPTR *args; { register int dskp, rval; @@ -2424,7 +2424,7 @@ COM_changedir(args) * strips the version field by invoking DSK_getfilename with NON recognition mode. */ -COM_getfreeblock(args) +LispPTR COM_getfreeblock(args) register LispPTR *args; { register int dskp, rval, *buf; @@ -2670,7 +2670,7 @@ void separate_version(name, ver, checkp) #ifdef DOS -separate_drive(lfname, drive) +void separate_drive(lfname, drive) register char *lfname; char *drive; { @@ -2724,7 +2724,7 @@ separate_drive(lfname, drive) * */ -unpack_filename(file, dir, name, ver, checkp) +int unpack_filename(file, dir, name, ver, checkp) register char *file; register char *dir; register char *name; @@ -2782,7 +2782,7 @@ unpack_filename(file, dir, name, ver, checkp) * */ -true_name(path) +int true_name(path) register char *path; { char dir[MAXPATHLEN]; @@ -2876,7 +2876,7 @@ true_name(path) * */ -locate_file(dir, name) +int locate_file(dir, name) register char *dir; register char *name; { @@ -2982,7 +2982,7 @@ locate_file(dir, name) * */ -make_directory(dir) +int make_directory(dir) register char *dir; { register char *cp, *dp; @@ -3256,7 +3256,7 @@ make_directory(dir) /* */ /************************************************************************/ -get_version_array(dir, file, varray, cache) +int get_version_array(dir, file, varray, cache) register char *dir; register char *file; register FileName *varray; @@ -3505,7 +3505,7 @@ get_version_array(dir, file, varray, cache) * to maintain the directory on which a file is being created. */ -maintain_version(file, varray, forcep) +int maintain_version(file, varray, forcep) register char *file; register FileName *varray; register int forcep; @@ -3673,7 +3673,7 @@ maintain_version(file, varray, forcep) * */ -get_versionless(varray, file, dir) +int get_versionless(varray, file, dir) register FileName *varray; register char *file; register char *dir; @@ -3730,7 +3730,7 @@ return(0); * */ -check_vless_link(vless, varray, to_file, highest_p) +int check_vless_link(vless, varray, to_file, highest_p) register char *vless; register FileName *varray; register char *to_file; @@ -3836,7 +3836,7 @@ check_vless_link(vless, varray, to_file, highest_p) * */ -get_old(dir, varray, afile, vfile) +int get_old(dir, varray, afile, vfile) register char *dir; register FileName *varray; register char *afile; @@ -4038,7 +4038,7 @@ get_old(dir, varray, afile, vfile) * */ -get_oldest(dir, varray, afile, vfile) +int get_oldest(dir, varray, afile, vfile) register char *dir; register FileName *varray; register char *afile; @@ -4239,7 +4239,7 @@ get_oldest(dir, varray, afile, vfile) * */ -get_new(dir, varray, afile, vfile) +int get_new(dir, varray, afile, vfile) register char *dir; register FileName *varray; register char *afile; @@ -4539,7 +4539,7 @@ get_new(dir, varray, afile, vfile) * */ -get_old_new(dir, varray, afile, vfile) +int get_old_new(dir, varray, afile, vfile) register char *dir; register FileName *varray; register char *afile; diff --git a/src/dspif.c b/src/dspif.c index 32ce2f4..848b9a0 100755 --- a/src/dspif.c +++ b/src/dspif.c @@ -47,7 +47,7 @@ extern DspInterface X_init( DspInterface dsp, extern int dosdisplaymode; #endif /* DOS */ -make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint) +void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint) { #ifdef DOS @@ -120,7 +120,7 @@ void GenericPanic(DspInterface dsp) } -SwitchDisplay(LispPTR display) +LispPTR SwitchDisplay(LispPTR display) { DspInterface tmp; /* Switch-a-roo! */ diff --git a/src/dspsubrs.c b/src/dspsubrs.c index 1b8834f..6399fcb 100755 --- a/src/dspsubrs.c +++ b/src/dspsubrs.c @@ -49,7 +49,7 @@ extern int Mouse_Included; * ****************************************************/ -DSP_dspbout( args ) +void DSP_dspbout( args ) LispPTR *args; /* args[0] : charcode */ { putc( (args[0] & 0xFFFF) & 0x7f, BCPLDISPLAY ); @@ -66,7 +66,7 @@ LispPTR *args; /* args[0] : charcode */ extern int DisplayInitialized ; -DSP_showdisplay( args ) +void DSP_showdisplay( args ) LispPTR *args; { DisplayInitialized = 1; @@ -81,7 +81,7 @@ LispPTR *args; * ****************************************************/ -DSP_VideoColor( args ) +LispPTR DSP_VideoColor( args ) LispPTR *args; /* args[0] : black flag */ { int invert; @@ -115,7 +115,7 @@ extern int errno; * called from \HARDCURSORUP etc. * ****************************************************/ -DSP_Cursor( args , argnum) +void DSP_Cursor( args , argnum) LispPTR *args; int argnum; /* args[0] : hot sopt X * args[1] : hot spot Y @@ -187,7 +187,7 @@ LispPTR *args; int argnum; * ****************************************************/ -DSP_SetMousePos( args ) +void DSP_SetMousePos( args ) register LispPTR *args; /* args[0] : X pos * args[1] : Y pos */ @@ -235,7 +235,7 @@ register LispPTR *args; /* args[0] : X pos * called from \Katana.DisplayWidth. * ****************************************************/ -DSP_ScreenWidth( args ) +LispPTR DSP_ScreenWidth( args ) LispPTR *args; { return( S_POSITIVE | (0xFFFF & displaywidth) ); @@ -247,7 +247,7 @@ LispPTR *args; * called from \Katana.DisplayHeight. * ****************************************************/ -DSP_ScreenHight( args ) +LispPTR DSP_ScreenHight( args ) LispPTR *args; { return( S_POSITIVE | (0xFFFF & displayheight) ); @@ -266,7 +266,7 @@ extern int for_makeinit; extern int Current_Hot_X, Current_Hot_Y; #endif /* XWINDOW */ -flip_cursor() +void flip_cursor() { register DLword *word; register int cnt; diff --git a/src/eqf.c b/src/eqf.c index 6496ac6..fb010c9 100755 --- a/src/eqf.c +++ b/src/eqf.c @@ -96,7 +96,7 @@ BIGNUM (integer that can't be represented bigger than 32 bits) /* */ /************************************************************************/ -int N_OP_clequal(register int arg1, register int arg2) +LispPTR N_OP_clequal(register int arg1, register int arg2) { register int type; @@ -145,7 +145,7 @@ int N_OP_clequal(register int arg1, register int arg2) /* */ /************************************************************************/ -int N_OP_eqlop(register int arg1, register int arg2) +LispPTR N_OP_eqlop(register int arg1, register int arg2) { register int type; @@ -189,7 +189,7 @@ int N_OP_eqlop(register int arg1, register int arg2) /* */ /************************************************************************/ -N_OP_equal(register int arg1, register int arg2) +LispPTR N_OP_equal(register int arg1, register int arg2) { register int type, type2; @@ -253,7 +253,7 @@ arg2_small: /* */ /************************************************************************/ -N_OP_eqq(register int arg1, register int arg2) /* CL:= opcode 0377 */ +LispPTR N_OP_eqq(register int arg1, register int arg2) /* CL:= opcode 0377 */ { register int type1, type2; diff --git a/src/ether.c b/src/ether.c index 075583d..3837842 100755 --- a/src/ether.c +++ b/src/ether.c @@ -146,7 +146,7 @@ static struct nit_ioc nioc; /* */ /************************************************************************/ -ether_suspend(args) +LispPTR ether_suspend(args) LispPTR args[]; { #ifndef NOETHER @@ -203,7 +203,7 @@ ether_suspend(args) /* */ /************************************************************************/ -ether_resume(args) +LispPTR ether_resume(args) LispPTR args[]; { #ifndef NOETHER @@ -255,7 +255,7 @@ ether_resume(args) /* */ /************************************************************************/ -ether_ctrlr(args) +LispPTR ether_ctrlr(args) LispPTR args[]; { if (ether_fd < 0) return(NIL); @@ -268,7 +268,7 @@ ether_ctrlr(args) * ether_reset(args) 175/73/0 * reset ether controller and disable receipt of packets **********************************************************************/ -ether_reset(args) +LispPTR ether_reset(args) LispPTR args[]; { int i; @@ -302,7 +302,7 @@ ether_reset(args) /* */ /************************************************************************/ -ether_get(args) +LispPTR ether_get(args) LispPTR args[]; { LispPTR MaxByteCount; @@ -345,7 +345,7 @@ ether_get(args) **********************************************************************/ #define OFFSET sizeof(sa.sa_data) -ether_send(args) +LispPTR ether_send(args) LispPTR args[]; { #ifndef NOETHER @@ -416,7 +416,7 @@ LispPTR args[]; * check whether a packet has come. if does, notify iocb **********************************************************************/ -ether_setfilter(args) +LispPTR ether_setfilter(args) LispPTR args[]; { return(NIL); @@ -461,7 +461,7 @@ static struct timeval EtherTimeout = { static int nitpos=0, nitlen=0; /* for NIT read buffer in OS3 */ #endif -check_ether() +LispPTR check_ether() { /* * If receiver active then check if any packets are @@ -593,7 +593,7 @@ check_ether() /* */ /************************************************************************/ -get_packet() +LispPTR get_packet() { #ifndef NOETHER #ifndef PKTFILTER @@ -697,7 +697,7 @@ get_packet() * This is believed obsolete with packet filtering enabled **********************************************************************/ -check_filter(buffer) +int check_filter(buffer) u_char* buffer; { /* broadcast packets */ @@ -727,7 +727,7 @@ check_filter(buffer) * Also believed obsolete **********************************************************************/ -ether_addr_equal(add1, add2) +int ether_addr_equal(add1, add2) u_char add1[], add2[]; { @@ -742,7 +742,7 @@ u_char add1[], add2[]; * init_uid() * sets effective user-id to real user-id **********************************************************************/ -init_uid() +void init_uid() { #ifndef NOETHER int rid; @@ -761,7 +761,7 @@ init_uid() /* */ /************************************************************************/ -init_ifpage_ether() +void init_ifpage_ether() { InterfacePage->nshost0 = (DLword)((ether_host[0] << 8) + ether_host[1]); InterfacePage->nshost1 = (DLword)((ether_host[2] << 8) + ether_host[3]); @@ -787,7 +787,7 @@ struct sockaddr_nit snit; /* open nit socket, called from main before starting BCE. */ /* */ /************************************************************************/ -init_ether() +void init_ether() { #ifndef NOETHER @@ -837,7 +837,7 @@ init_ether() if (ioctl(ether_fd, I_STR, &si) < 0) { perror("ioctl: I_STR PFIOCSETF"); - return(-1); + return; } flags = fcntl(ether_fd, F_GETFL, 0); @@ -923,7 +923,7 @@ I_Give_Up: close(ether_fd); ether_fd = -1; #ifndef OS4 - return(NIL); + return; #else /* OS4 */ goto I_Give_Up; @@ -1033,7 +1033,7 @@ if (ether_fd >= 0) { close(ether_fd); ether_fd = -1; - return(NIL); + return; } #else /* PKTFILTER */ @@ -1052,7 +1052,7 @@ if (ether_fd >= 0) { perror("init_ether nopf ioctl: I_STR PFIOCSETF"); close(ether_fd); ether_fd = -1; - return(NIL); + return; } #else @@ -1061,7 +1061,7 @@ if (ether_fd >= 0) { close(ether_fd); ether_fd = -1; - return(NIL); + return; } #endif /* USE_DLPI */ #endif /* PKTFILTER -- jds 23 sep 96 unmatched if fix */ @@ -1107,7 +1107,7 @@ if (ether_fd >= 0) { perror("init_ether goodpf ioctl: I_STR PFIOCSETF"); close(ether_fd); ether_fd = -1; - return(NIL); + return; } #else @@ -1115,7 +1115,7 @@ if (ether_fd >= 0) { perror("init_ether: NIOCSETF failed:\n"); close(ether_fd); ether_fd = -1; - return(NIL); + return; } #endif /* USE_DLPI */ #ifndef USE_DLPI @@ -1125,7 +1125,7 @@ if (ether_fd >= 0) { perror("init_ether: I_SETSIG failed:\n"); close(ether_fd); ether_fd = -1; - return(NIL); + return; } #endif /* USE_DLPI */ #endif /* PKTFILTER */ @@ -1160,7 +1160,7 @@ if (ether_fd >= 0) { /* */ /************************************************************************/ -check_sum(args) +LispPTR check_sum(args) register LispPTR *args; { register LispPTR checksum; diff --git a/src/fp.c b/src/fp.c index 31ca8e4..10eccb5 100755 --- a/src/fp.c +++ b/src/fp.c @@ -57,7 +57,7 @@ DLword *createcell68k(unsigned int type); /* */ /************************************************************************/ -N_OP_fplus2(LispPTR parg1, LispPTR parg2) +LispPTR N_OP_fplus2(LispPTR parg1, LispPTR parg2) { REGISTER float arg1; REGISTER float arg2; @@ -87,7 +87,7 @@ N_OP_fplus2(LispPTR parg1, LispPTR parg2) /* */ /************************************************************************/ -N_OP_fdifference(LispPTR parg1, LispPTR parg2) +LispPTR N_OP_fdifference(LispPTR parg1, LispPTR parg2) { REGISTER float arg1, arg2; REGISTER float result; @@ -117,7 +117,7 @@ N_OP_fdifference(LispPTR parg1, LispPTR parg2) /* */ /************************************************************************/ -N_OP_ftimes2(LispPTR parg1, LispPTR parg2) +LispPTR N_OP_ftimes2(LispPTR parg1, LispPTR parg2) { REGISTER float arg1, arg2; REGISTER float result; @@ -147,7 +147,7 @@ N_OP_ftimes2(LispPTR parg1, LispPTR parg2) /* */ /************************************************************************/ -N_OP_fquotient(LispPTR parg1, LispPTR parg2) +LispPTR N_OP_fquotient(LispPTR parg1, LispPTR parg2) { REGISTER float arg1, arg2; REGISTER float result; @@ -177,7 +177,7 @@ N_OP_fquotient(LispPTR parg1, LispPTR parg2) /* */ /************************************************************************/ -N_OP_fgreaterp(LispPTR parg1, LispPTR parg2) +LispPTR N_OP_fgreaterp(LispPTR parg1, LispPTR parg2) { REGISTER float arg1, arg2; register DLword *wordp; diff --git a/src/fvar.c b/src/fvar.c index a52950c..9f4cb18 100755 --- a/src/fvar.c +++ b/src/fvar.c @@ -441,7 +441,7 @@ native_newframe 3. return the pointer ******************************************************************************/ -native_newframe(int slot) +LispPTR native_newframe(int slot) /* index of FVAR slot. */ { register struct frameex2 *newpfra2; /* pointer to new frame extension */ diff --git a/src/gc2.c b/src/gc2.c index b4835bd..2c802d2 100755 --- a/src/gc2.c +++ b/src/gc2.c @@ -53,7 +53,7 @@ static char *id = "$Id: gc2.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyright */ /**********************************************************************/ -OP_gcscan1(void) +void OP_gcscan1(void) { DLword gcscan1(register int probe); @@ -78,7 +78,7 @@ OP_gcscan1(void) */ /**********************************************************************/ -OP_gcscan2(void) +void OP_gcscan2(void) { DLword gcscan2(register int probe); diff --git a/src/gcarray.c b/src/gcarray.c index 60bbf36..4edaa3b 100755 --- a/src/gcarray.c +++ b/src/gcarray.c @@ -65,6 +65,7 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr #include "array.h" #include "debug.h" #include "lispmap.h" +#include /*** not currently used -FS #define min(a,b) ((a > b)?b:a) diff --git a/src/gccode.c b/src/gccode.c index f8cb0b4..ed4f92f 100755 --- a/src/gccode.c +++ b/src/gccode.c @@ -51,6 +51,7 @@ static char *id = "$Id: gccode.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyri #include "ifpage.h" #include "gc.h" #include "array.h" +#include #define min(a,b) ((a > b)?b:a) @@ -217,7 +218,7 @@ typedef ByteCode *InstPtr; /* */ /************************************************************************/ -map_code_pointers(LispPTR codeblock, short int casep) +LispPTR map_code_pointers(LispPTR codeblock, short int casep) { InstPtr codeptr; register unsigned int opnum; @@ -362,7 +363,7 @@ LispPTR reclaimcodeblock(LispPTR codebase) /* */ /************************************************************************/ -code_block_size(long unsigned int codeblock68k) +int code_block_size(long unsigned int codeblock68k) { InstPtr codeptr, initcodeptr; register unsigned int opnum; diff --git a/src/gcfinal.c b/src/gcfinal.c index d488229..3f468b0 100755 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -63,6 +63,7 @@ static char *id = "$Id: gcfinal.c,v 1.3 1999/05/31 23:35:31 sybalsky Exp $ Copyr #include "ifpage.h" #include "gc.h" #include "array.h" +#include #ifdef NEVER #define GetSegnuminColl(entry1) ((entry1 & 0x01fe) >> 1) /* segnum field */ @@ -121,10 +122,11 @@ struct buf { }; #endif /* BYTESWAP */ +void printarrayblock(LispPTR base); /************* The following procedure is common !! **************************/ -integerlength(unsigned int n) +int integerlength(unsigned int n) {int cnt; if (n <= 2) return(n); @@ -589,7 +591,7 @@ LispPTR reclaimstackp (LispPTR ptr) /* This is the entry function */ /* */ /************************************************************************/ -printarrayblock(LispPTR base) +void printarrayblock(LispPTR base) { struct arrayblock *bbase, *btrailer, *ptrailer; struct arrayblock *bfwd, *bbwd, *rbase; diff --git a/src/gchtfind.c b/src/gchtfind.c index 250b25c..36b8434 100755 --- a/src/gchtfind.c +++ b/src/gchtfind.c @@ -455,7 +455,7 @@ nolink: /* no match */ /************************************************************************/ /* */ -/* r e d _ h t f i n d */ +/* r e c _ h t f i n d */ /* */ /* Version of HTFIND used during reclaims (part of GC process) */ /* Same purpose, but doesn't increment the GC count-down, and */ diff --git a/src/gcmain3.c b/src/gcmain3.c index 66bae0c..57b51b5 100755 --- a/src/gcmain3.c +++ b/src/gcmain3.c @@ -109,7 +109,7 @@ static char *id = "$Id: gcmain3.c,v 1.4 1999/05/31 23:35:31 sybalsky Exp $ Copyr #ifdef GCC386 /* byte-swapped, 386 assembler version */ -gcmapscan() +LispPTR gcmapscan() { volatile DLword probe; volatile DLword *entry; @@ -303,7 +303,7 @@ returNIL: \n\ #else -gcmapscan(void) +LispPTR gcmapscan(void) { register GCENTRY probe; register GCENTRY *entry; @@ -360,7 +360,7 @@ gcmapscan(void) -gcmapunscan(void) +LispPTR gcmapunscan(void) { register GCENTRY probe; register GCENTRY *entry; @@ -406,7 +406,7 @@ gcmapunscan(void) -gcscanstack(void) +LispPTR gcscanstack(void) { register Bframe *bascframe; Bframe *obascframe; diff --git a/src/gcoflow.c b/src/gcoflow.c index 54441e6..2e5cc16 100755 --- a/src/gcoflow.c +++ b/src/gcoflow.c @@ -62,7 +62,7 @@ static char *id = "$Id: gcoflow.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyr }; \ -gc_handleoverflow(DLword arg) +DLword gc_handleoverflow(DLword arg) { struct htoverflow *cell; struct dtd *ptr; LispPTR cellcnt; @@ -86,7 +86,7 @@ gc_handleoverflow(DLword arg) return(arg); } -gcmaptable(DLword arg) +DLword gcmaptable(DLword arg) { struct htoverflow *cell; struct dtd *ptr; LispPTR cellcnt; diff --git a/src/gcr.c b/src/gcr.c index c73b881..048fd9f 100755 --- a/src/gcr.c +++ b/src/gcr.c @@ -107,7 +107,7 @@ static char *id = "$Id: gcr.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyright #endif /* BYTESWAP */ -gcarrangementstack(void) +void gcarrangementstack(void) { LispPTR tmpnextblock; PushCStack; tmpnextblock = LADDR_from_68k(CurrentStackPTR+=WORDSPERCELL); @@ -125,19 +125,18 @@ if ((UNSIGNED)EndSTKP == (UNSIGNED)CurrentStackPTR) error("creating 0-long stack /* remaining the system status. */ /****************************************************************/ -dogc01(void) +void dogc01(void) { gcarrangementstack(); gcscanstack(); gcmapscan(); gcmapunscan(); PopCStack; - return(NIL); } /*!!!!!! should update clock in Miscstats */ -doreclaim(void) +void doreclaim(void) { int gctm1; MISCSTATS gcmisc; @@ -160,7 +159,7 @@ doreclaim(void) -disablegc1(int noerror) +void disablegc1(int noerror) { struct interruptstate *gcinterruptstate; int count, i; @@ -182,5 +181,4 @@ disablegc1(int noerror) *PENDINGINTERRUPT_word = ATOM_T; }; *GcDisabled_word = ATOM_T; - return(NIL); } diff --git a/src/gcrcell.c b/src/gcrcell.c index 54c326f..a641c5f 100755 --- a/src/gcrcell.c +++ b/src/gcrcell.c @@ -110,6 +110,7 @@ unsigned todo_uses = 0; unsigned todo_misses = 0; unsigned todo_reads = 0; +void freelistcell(LispPTR cell); /************************************************************************/ /* */ @@ -119,7 +120,7 @@ unsigned todo_reads = 0; /* */ /************************************************************************/ -gcreccell(LispPTR cell) +LispPTR gcreccell(LispPTR cell) { register ConsCell *ptr; struct dtd *typdtd; @@ -338,7 +339,7 @@ gcreccell(LispPTR cell) /* */ /************************************************************************/ -freelistcell(LispPTR cell) +void freelistcell(LispPTR cell) { struct conspage *pbase; register ConsCell *cell68k; diff --git a/src/hardrtn.c b/src/hardrtn.c index 53b0fee..5aadf1c 100755 --- a/src/hardrtn.c +++ b/src/hardrtn.c @@ -65,7 +65,7 @@ static char *id = "$Id: hardrtn.c,v 1.4 2001/12/24 01:09:02 sybalsky Exp $ Copyr */ /********************************************************************/ -slowreturn(void) +int slowreturn(void) { register DLword *next68k; register DLword *freeptr; diff --git a/src/inet.c b/src/inet.c index cf43510..096a26d 100755 --- a/src/inet.c +++ b/src/inet.c @@ -98,7 +98,7 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh extern u_int LispIOFds, LispReadFds; extern int *Lisp_errno; -subr_TCP_ops (op, nameConn, proto, length, bufaddr, maxlen) +LispPTR subr_TCP_ops (op, nameConn, proto, length, bufaddr, maxlen) int op; LispPTR nameConn, proto, length, bufaddr, maxlen; { diff --git a/src/initkbd.c b/src/initkbd.c index df90ec3..1fcc7de 100755 --- a/src/initkbd.c +++ b/src/initkbd.c @@ -363,8 +363,10 @@ u_char DOSLispKeyMap_101[0x80] = /* 7*/ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; +void set_kbd_iopointers(); +void keyboardtype(int fd); -init_keyboard(flg) +void init_keyboard(flg) int flg ; /* if 0 init else re-init */ { int keytrans; @@ -427,7 +429,7 @@ init_keyboard(flg) /* ----------------------------------------------------------------*/ -device_before_exit() +void device_before_exit() { #ifdef SUNDISPLAY int keytrans; @@ -456,7 +458,7 @@ device_before_exit() /* ----------------------------------------------------------------*/ -set_kbd_iopointers() +void set_kbd_iopointers() { IOPage68K = (IOPAGE *)IOPage; EmMouseX68K = (DLword *) &(IOPage68K->dlmousex); @@ -491,7 +493,7 @@ set_kbd_iopointers() /* ----------------------------------------------------------------*/ #ifdef SUNDISPLAY -seteventmask( eventmask ) +void seteventmask( eventmask ) struct inputmask *eventmask; { input_imnull( eventmask ); @@ -671,7 +673,7 @@ int find_unused_key(map, minkey, len, syms, sym, table) /* */ /************************************************************************/ -keyboardtype(fd) +void keyboardtype(fd) int fd; { int type; diff --git a/src/initsout.c b/src/initsout.c index 77ad411..e19da8f 100755 --- a/src/initsout.c +++ b/src/initsout.c @@ -69,6 +69,11 @@ DLword REPLACE_atom; #define GCENTRY DLword #endif +/* forward references */ +void init_for_keyhandle(void); +void init_for_bltchar(void); +void init_for_bitblt(void); + /************************************************************************/ /* */ /* f i x p _ v a l u e */ @@ -114,7 +119,7 @@ LispPTR * fixp_value(LispPTR *ptr) #define PAGES_IN_MBYTE 2048 -init_ifpage(int sysout_size) +void init_ifpage(int sysout_size) { extern long MDate; extern int DisplayType; @@ -201,7 +206,7 @@ init_ifpage(int sysout_size) /* */ /************************************************************************/ -init_iopage(void) +void init_iopage(void) { /* @@ -232,7 +237,7 @@ extern int for_makeinit; extern LispPTR *MakeAtom68k(char *string); -build_lisp_map(void) +void build_lisp_map(void) { DLword index; @@ -392,7 +397,7 @@ build_lisp_map(void) /* */ /************************************************************************/ -init_for_keyhandle(void) +void init_for_keyhandle(void) { DLword index; extern DLword *CTopKeyevent; @@ -474,7 +479,7 @@ init_for_keyhandle(void) /* */ /************************************************************************/ -init_for_bltchar(void) +void init_for_bltchar(void) { LispPTR index; char *IL; @@ -523,7 +528,7 @@ init_for_bltchar(void) /* */ /************************************************************************/ -init_for_bitblt(void) +void init_for_bitblt(void) { LispPTR index; char *IL; diff --git a/src/kbdsubrs.c b/src/kbdsubrs.c index 5246af3..d1c432e 100755 --- a/src/kbdsubrs.c +++ b/src/kbdsubrs.c @@ -73,7 +73,7 @@ extern int LispWindowFd, extern int errno; -KB_enable( args ) +void KB_enable( args ) LispPTR *args; /* args[0] : ON/OFF flag * T -- ON * NIL -- OFF @@ -123,7 +123,7 @@ extern int LispKbdFd; int bell_status_word; #endif /* DOS */ -KB_beep( args ) +void KB_beep( args ) LispPTR *args; /* args[0] : ON/OFF flag * T -- ON * NIL -- OFF @@ -173,13 +173,8 @@ LispPTR *args; /* args[0] : ON/OFF flag } #endif /* SUNDISPLAY, XWINDOW, DOS */ - - - } - - /**************************************************** * * KB_setmp() entry of SUBRCALL 81 1 @@ -187,7 +182,7 @@ LispPTR *args; /* args[0] : ON/OFF flag * ****************************************************/ -KB_setmp( args ) +void KB_setmp( args ) LispPTR *args; /* args[0] : MPCODE */ { @@ -196,7 +191,6 @@ LispPTR *args; /* args[0] : MPCODE */ #endif } - /**************************************************** * * KB_setled() @@ -209,7 +203,7 @@ LispPTR *args; /* args[0] : MPCODE */ * ****************************************************/ -KB_setled( args ) +void KB_setled( args ) LispPTR *args; { #ifdef DOS diff --git a/src/keyevent.c b/src/keyevent.c index 80960a4..f373399 100755 --- a/src/keyevent.c +++ b/src/keyevent.c @@ -17,8 +17,6 @@ static char *id = "$Id: keyevent.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copy #include "version.h" - - /* * This file contains the routines that interface Lisp to the * Sun keyboard and mouse. @@ -328,7 +326,7 @@ DLword ColorCursor_savebitmap[CURSORWIDTH/COLORPIXELS_IN_DLWORD * CURSORHEIGHT]; /* */ /************************************************************************/ -getsignaldata(sig, code, scp) +void getsignaldata(sig, code, scp) int sig, code; struct sigcontext *scp; { @@ -447,8 +445,7 @@ getmore: #endif /* DOS */ } /* end getsignaldata */ - - +void kb_trans( u_short keycode, u_short upflg ); /************************************************************************/ /* */ @@ -594,7 +591,7 @@ register struct inputevent *event; /* */ /************************************************************************/ -kb_trans( keycode, upflg ) +void kb_trans( keycode, upflg ) u_short keycode; u_short upflg; { diff --git a/src/keylib.c b/src/keylib.c index 848ab35..22cf5c9 100755 --- a/src/keylib.c +++ b/src/keylib.c @@ -72,7 +72,7 @@ unsigned long make_verification (long unsigned int x, long unsigned int y) =============================================================================*/ -imod64bit (long unsigned int x1, long unsigned int x0, long unsigned int y) +int imod64bit (long unsigned int x1, long unsigned int x0, long unsigned int y) { /* JDS 990601 ansi return (((x0 % y) + ((x1 % y) * (((ULONG_MAX % y) + 1 ) % y) )) % y); */ return (((x0 % y) + ((x1 % y) * ((y + 1 ) % y) )) % y); diff --git a/src/keymaker.c b/src/keymaker.c index 1a32cd9..0e047cb 100755 --- a/src/keymaker.c +++ b/src/keymaker.c @@ -67,7 +67,7 @@ unsigned long modify(long unsigned int hostid); /* */ /************************************************************************/ -writeresults(FILE *fp, char *host, char *expdate, int key1, int key2, int key3, char *info) +void writeresults(FILE *fp, char *host, char *expdate, int key1, int key2, int key3, char *info) { fprintf(fp, "Host ID: %-14s Expiration: %-9s",host, expdate); fprintf(fp, " Key: %8x %8x %8x", key1, key2, key3); @@ -84,7 +84,7 @@ writeresults(FILE *fp, char *host, char *expdate, int key1, int key2, int key3, /* */ /************************************************************************/ -main(int argc, char **argv) +int main(int argc, char **argv) { int logfile = 0; /* set to 1 if logfile on command line */ FILE *fp; /* file pointer for the logfile */ @@ -227,6 +227,7 @@ main(int argc, char **argv) if (commandlineargs) { printf("%8x %8x %8x\n", *keyarray, *(keyarray+1), *(keyarray+2)); + exit(1); } else { diff --git a/src/keytstno.c b/src/keytstno.c index 384d937..3533c80 100755 --- a/src/keytstno.c +++ b/src/keytstno.c @@ -20,7 +20,7 @@ static char *id = "$Id: keytstno.c,v 1.3 1999/05/31 23:35:36 sybalsky Exp $ Copy #include "version.h" -keytester (void) +int keytester (void) { return 0; } diff --git a/src/kprint.c b/src/kprint.c index c38dd0a..0113e89 100755 --- a/src/kprint.c +++ b/src/kprint.c @@ -35,6 +35,12 @@ int Printdepth=0; int PrintMaxLen = 10; int PrintLen[20] ; +/* forward references */ +void print_string(LispPTR x); +void print_NEWstring(LispPTR x); +void print_fixp(LispPTR x); +void print_floatp(LispPTR x); + /************************************************************************/ /* */ /* P R I N D A T U M */ @@ -155,7 +161,7 @@ LispPTR print(LispPTR x) /* */ /************************************************************************/ -print_string(LispPTR x) +void print_string(LispPTR x) { struct stringp *string_point; DLword st_length; @@ -190,7 +196,7 @@ print_string(LispPTR x) /* */ /************************************************************************/ -print_NEWstring(LispPTR x) +void print_NEWstring(LispPTR x) { NEWSTRINGP *string_point; DLword st_length; @@ -224,7 +230,7 @@ print_NEWstring(LispPTR x) /* */ /************************************************************************/ -print_fixp(LispPTR x) +void print_fixp(LispPTR x) { int *addr_fixp; @@ -242,7 +248,7 @@ print_fixp(LispPTR x) /* */ /************************************************************************/ -print_floatp(LispPTR x) +void print_floatp(LispPTR x) { float *addr_floatp; diff --git a/src/ldeether.c b/src/ldeether.c index 0a43bb9..bb9fcde 100755 --- a/src/ldeether.c +++ b/src/ldeether.c @@ -23,8 +23,9 @@ static char *id = "$Id: ldeether.c,v 1.3 2001/12/24 01:09:04 sybalsky Exp $ Copy #ifdef NOETHER /* No ethernet, so have a dummy here. */ -main (argc, argv, argp) int argc; char **argv, **argp; +int main (int argc, char *argv[]) { + return(0); } #else /* THERE -IS- AN ETHERNET */ @@ -97,7 +98,7 @@ char filetorun[30] = "lde"; -main(argc, argv, envp) int argc; char **argv, **envp; +int main(int argc, char *argv[]) { char Earg[30], Ename[30], **newargv; int i; @@ -284,8 +285,7 @@ newargv[i] = 0; /* then execve the LDE executable */ execvp(filetorun, newargv); perror(filetorun); -exit(1); +return(1); } #endif /* NOETHER */ - diff --git a/src/ldsout.c b/src/ldsout.c index 9c53c82..f7abd59 100755 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -85,7 +85,7 @@ static char *metersyms = "-\\|/"; extern DspInterface currentdsp; #endif /* DOS || XWINDOW */ -sysout_loader(sysout_file_name, sys_size) +int sysout_loader(sysout_file_name, sys_size) char *sysout_file_name; int sys_size; /* sysout size in megabytes */ { diff --git a/src/lisp2c.c b/src/lisp2c.c index 2cb3447..50b779b 100755 --- a/src/lisp2c.c +++ b/src/lisp2c.c @@ -53,7 +53,7 @@ int LispStringLength (LispPTR lispstring) -LispStringToCStr (LispPTR lispstring, char *cstring) +void LispStringToCStr (LispPTR lispstring, char *cstring) { OneDArray *arrayp; char *base; diff --git a/src/llcolor.c b/src/llcolor.c index d152608..6db4ff2 100755 --- a/src/llcolor.c +++ b/src/llcolor.c @@ -126,10 +126,11 @@ cgfour_init_color_display(color_bitmapbase) /* SUBR 0210 */ #else /* COLOR */ -cgfour_init_color_display(color_bitmapbase) /* SUBR 0210 */ +LispPTR cgfour_init_color_display(color_bitmapbase) /* SUBR 0210 */ LispPTR color_bitmapbase; /* COLOR BITMAP ADDRESS */ { printf( "Color is not supported.\n" ); + return (NIL); } #endif /* COLOR */ @@ -142,7 +143,7 @@ cgfour_init_color_display(color_bitmapbase) /* SUBR 0210 */ */ /*******************************************************************/ #ifdef COLOR -cgfour_change_screen_mode(which_screen) +LispPTR cgfour_change_screen_mode(which_screen) LispPTR which_screen; { /* subr 0211 */ struct pixrect *ColorFb; @@ -227,10 +228,11 @@ cgfour_change_screen_mode(which_screen) } #else /* COLOR */ -cgfour_change_screen_mode(which_screen) +LispPTR cgfour_change_screen_mode(which_screen) LispPTR which_screen; { printf( "Color is not supported.\n" ); + return (NIL); } #endif /* COLOR */ @@ -250,7 +252,7 @@ unsigned char GRN_colormap; unsigned char BLU_colormap; #ifdef COLOR -cgfour_set_colormap(args) +LispPTR cgfour_set_colormap(args) LispPTR args[]; { int index; @@ -274,10 +276,11 @@ cgfour_set_colormap(args) } #else /* COLOR */ -cgfour_set_colormap(args) +LispPTR cgfour_set_colormap(args) LispPTR args[]; { printf( "Color is not supported.\n" ); + return (NIL); } #endif /* COLOR */ @@ -287,7 +290,7 @@ cgfour_set_colormap(args) static struct pixrect *saved_screen; static int Screen_Saved = T; -save_color_screen() +void save_color_screen() { if( !Screen_Saved ) { saved_screen = mem_point( displaywidth @@ -301,7 +304,7 @@ save_color_screen() } /* end if(!Screen_Saved) */ } /* end save_color_screen() */ -restore_color_screen() +void restore_color_screen() { if( Screen_Saved ) { saved_screen = mem_point( displaywidth @@ -321,7 +324,7 @@ static unsigned char red_colormap[256] , green_colormap[256] , blue_colormap[256]; static int Saved_Colormap = NIL; -save_colormap() +void save_colormap() { struct pixrect *Color_Fb; @@ -339,7 +342,7 @@ save_colormap() } /* end if( !Saved_Colormap ) */ } /* end save_colormap() */ -restore_colormap() +void restore_colormap() { struct pixrect *Color_Fb; diff --git a/src/llstk.c b/src/llstk.c index 9328614..0d41587 100755 --- a/src/llstk.c +++ b/src/llstk.c @@ -47,7 +47,7 @@ static char *id = "$Id: llstk.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyrig extern int extended_frame; - +void blt(register DLword *dest68k, register DLword *source68k, int nw); /******************************************************************/ /* @@ -607,7 +607,7 @@ void flip_cursorbar(int n) blt(dest,source,size) */ /**************************************************************/ -blt(register DLword *dest68k, register DLword *source68k, int nw) +void blt(register DLword *dest68k, register DLword *source68k, int nw) { /******* OLD def , Due to C compiler's bug, we can't use pre-decriment for register val @@ -625,8 +625,6 @@ blt(register DLword *dest68k, register DLword *source68k, int nw) { GETWORD(dest68k--) = GETWORD(source68k--); } - - } @@ -1246,7 +1244,7 @@ void check_BF(Bframe *bf68k) /* */ /************************************************************************/ -check_stack_rooms(FX *fx68k) +int check_stack_rooms(FX *fx68k) { int size; DLword *freeptr68k,*endstk68k; diff --git a/src/loopsops.c b/src/loopsops.c index 95ad8eb..b8b73db 100755 --- a/src/loopsops.c +++ b/src/loopsops.c @@ -146,7 +146,7 @@ LispPTR atom_instance = 0, /* various atom indices */ /* Called once to initialize the "constants" above */ -LCinit(void) { +LispPTR LCinit(void) { atom_instance = GET_IL_ATOM("instance"); atom_class = GET_IL_ATOM("class"); atom_annotatedValue = GET_IL_ATOM("annotatedValue"); @@ -350,7 +350,7 @@ LCGetIVValue(register LispPTR object, register LispPTR iv) */ } -LCPutIVValue(register LispPTR object, register LispPTR iv, register LispPTR val) +LispPTR LCPutIVValue(register LispPTR object, register LispPTR iv, register LispPTR val) { register struct LCInstance *objptr; register LispPTR *valptr; diff --git a/src/lowlev2.c b/src/lowlev2.c index aa739d5..49eefa6 100755 --- a/src/lowlev2.c +++ b/src/lowlev2.c @@ -80,7 +80,7 @@ LispPTR N_OP_addbase(register int base, register int offset) ***********************************************************/ -N_OP_getbasebyte(register LispPTR base_addr, register int byteoffset) +LispPTR N_OP_getbasebyte(register LispPTR base_addr, register int byteoffset) { switch( (SEGMASK & byteoffset) ){ case S_POSITIVE: @@ -115,7 +115,7 @@ N_OP_getbasebyte(register LispPTR base_addr, register int byteoffset) ***********************************************************/ -N_OP_putbasebyte(register LispPTR base_addr, register int byteoffset, register int tos) +LispPTR N_OP_putbasebyte(register LispPTR base_addr, register int byteoffset, register int tos) { if(((SEGMASK & tos ) != S_POSITIVE) || ((unsigned short)tos >= 256)) ERROR_EXIT(tos); diff --git a/src/main.c b/src/main.c index 197b72a..b611fff 100755 --- a/src/main.c +++ b/src/main.c @@ -329,6 +329,10 @@ char *helpstring = "\n\ -info Print general info about the system\n\ -help Print this message\n"; #endif /* DOS */ + +void start_lisp(); +void print_info_lines(); + /************************************************************************/ /* */ /* M A I N E N T R Y P O I N T */ @@ -336,7 +340,7 @@ char *helpstring = "\n\ /* */ /************************************************************************/ -main(argc, argv) +int main(argc, argv) int argc ; char **argv ; { @@ -673,6 +677,7 @@ main(argc, argv) /* now start up lisp */ start_lisp(); + return (0); } @@ -687,7 +692,7 @@ main(argc, argv) /* */ /************************************************************************/ -start_lisp() +void start_lisp() { DLword *freeptr,*next68k; @@ -746,7 +751,7 @@ start_lisp() /* */ /************************************************************************/ -makepathname(src, dst) +int makepathname(src, dst) register char *src; register char *dst; { @@ -848,7 +853,7 @@ makepathname(src, dst) -print_info_lines () +void print_info_lines () { #if (RELEASE == 200) printf("Emulator for Medley release 2.0\n"); diff --git a/src/misc7.c b/src/misc7.c index 2b4d1e1..74469bb 100755 --- a/src/misc7.c +++ b/src/misc7.c @@ -67,7 +67,7 @@ extern int ScreenLocked; /*** N_OP_misc7 -- pseudocolor or fbitmapbit ***/ -N_OP_misc7(arg1, arg2, arg3, arg4, arg5, arg6, arg7, alpha) +LispPTR N_OP_misc7(arg1, arg2, arg3, arg4, arg5, arg6, arg7, alpha) int alpha; register LispPTR arg1, arg2, arg3, arg4, arg5, arg6, arg7; { diff --git a/src/mkatom.c b/src/mkatom.c index 73dd4ce..b649b0e 100755 --- a/src/mkatom.c +++ b/src/mkatom.c @@ -73,7 +73,7 @@ extern DLword *Lisp_world ; /**********************************************************************/ -compute_hash (char *char_base, DLword offset, DLword length) +DLword compute_hash (char *char_base, DLword offset, DLword length) { DLword hash; DLword number; @@ -107,7 +107,7 @@ compute_hash (char *char_base, DLword offset, DLword length) /**********************************************************************/ -compute_lisp_hash (char *char_base, DLword offset, DLword length, DLword fatp) +DLword compute_lisp_hash (char *char_base, DLword offset, DLword length, DLword fatp) { DLword hash; DLword number; @@ -165,7 +165,7 @@ compute_lisp_hash (char *char_base, DLword offset, DLword length, DLword fatp) */ /**********************************************************************/ -compare_chars(register char *char1, register char *char2, register DLword length) +LispPTR compare_chars(register char *char1, register char *char2, register DLword length) { #ifndef BYTESWAP if (memcmp ( char1, char2, length ) == 0) @@ -183,7 +183,7 @@ compare_chars(register char *char1, register char *char2, register DLword length } /* end compare_chars */ #ifdef BYTESWAP -bytecmp (char1, char2, len) +int bytecmp (char1, char2, len) char *char1; char *char2; int len; @@ -217,7 +217,7 @@ bytecmp (char1, char2, len) */ /**********************************************************************/ -compare_lisp_chars(register char *char1, register char *char2, register DLword length, DLword fat1, DLword fat2) +LispPTR compare_lisp_chars(register char *char1, register char *char2, register DLword length, DLword fat1, DLword fat2) { if ((!fat1) == (!fat2)) { /* both fat or both non-fat. */ @@ -260,7 +260,7 @@ compare_lisp_chars(register char *char1, register char *char2, register DLword l -lispcmp (DLword *char1, unsigned char *char2, int len) +int lispcmp (DLword *char1, unsigned char *char2, int len) { int index; for (index=0; index @@ -110,7 +98,7 @@ extern u_int LispReadFds; /* */ /************************************************************************/ -mess_init() +void mess_init() { #ifndef XWINDOW #ifndef DOS @@ -135,7 +123,7 @@ needpty: if( (ptyfd=open(ptyname, 2)) >= 0 ) goto gotpty; ptynum++; } - return(NIL); + return; gotpty: ttyname[9] = ptyname[9]; if( (ttyfd=open(ttyname, 2)) < 0) @@ -180,11 +168,11 @@ gotpty: sprintf(logfile,"/tmp/%s-lisp.log", pwd->pw_name); if( unlink(logfile) == -1) { /* delete old log file */ - if(errno != ENOENT) return(NIL); + if(errno != ENOENT) return; } if( (log_id = open(logfile, (O_RDWR | O_CREAT), 0666)) < 0 ) - return(NIL); + return; #ifdef LOGINT LogFileFd = 1 << cons_pty; flags = fcntl(cons_pty, F_GETFL, 0); @@ -217,7 +205,7 @@ gotpty: /* */ /************************************************************************/ -mess_reset() +void mess_reset() { #ifndef DOS #ifndef XWINDOW @@ -252,7 +240,7 @@ mess_reset() #ifndef DOS static struct timeval selecttimeout = {0, 0}; #endif -mess_readp() +LispPTR mess_readp() { #ifndef DOS #ifndef XWINDOW @@ -278,9 +266,9 @@ mess_readp() * * * * * * * * * * * * * */ if (logChanged) return(ATOM_T); - return(NIL); #endif /* XWINDOW */ #endif /* DOS */ + return(NIL); } @@ -297,12 +285,13 @@ mess_readp() /* */ /************************************************************************/ -mess_read(args) +LispPTR mess_read(args) LispPTR *args; /* args[0] buffer */ { -#ifndef DOS -#ifndef XWINDOW +#if defined(DOS) || defined(XWINDOW) + return (NIL); +#else int id; struct stat sbuf; int size, save_size; @@ -363,8 +352,7 @@ mess_read(args) StrNCpyFromCToLisp(base,temp_buf, size); return(GetSmallp(size)); -#endif /* XWINDOW */ -#endif /* DOS */ +#endif /* DOS | XWINDOW*/ } @@ -381,10 +369,11 @@ mess_read(args) /* */ /************************************************************************/ -flush_pty() +LispPTR flush_pty() { -#ifndef DOS -#ifndef XWINDOW +#if defined(DOS) || defined(XWINDOW) + return (NIL); +#else int id; struct stat sbuf; char buf[MESSAGE_BUFFER_SIZE]; /* Buffer between pty and log file */ @@ -452,8 +441,7 @@ flush_pty() return(ATOM_T); } } -#endif /* XWINDOW */ -#endif /* DOS */ +#endif /* XWINDOW | DOS */ } diff --git a/src/perrno.c b/src/perrno.c index c3ad3d2..0a68b3a 100755 --- a/src/perrno.c +++ b/src/perrno.c @@ -48,7 +48,7 @@ extern char *sys_errlist[]; #endif /* LINUX */ #endif -perrorn(char *s, int n) +void perrorn(char *s, int n) { if ( s != NULL && *s != '\0' ) { fprintf(stderr, "%s: ",s); @@ -71,7 +71,7 @@ perrorn(char *s, int n) /* */ /************************************************************************/ -err_mess(char *from, int no) +void err_mess(char *from, int no) { int save_errno=errno; /* Save errno around OSMESSAGE_PRINT */ diff --git a/src/return.c b/src/return.c index dd664fb..b982ddc 100755 --- a/src/return.c +++ b/src/return.c @@ -63,7 +63,7 @@ static char *id = "$Id: return.c,v 1.4 2001/12/24 01:09:05 sybalsky Exp $ Copyri /***********************************************************************/ -OP_contextsw(void) +void OP_contextsw(void) { void contextsw( DLword fxnum, DLword bytenum, diff --git a/src/rpc.c b/src/rpc.c index cfd0990..e40ed82 100755 --- a/src/rpc.c +++ b/src/rpc.c @@ -59,7 +59,7 @@ static char *id = "$Id: rpc.c,v 1.3 2001/12/24 01:09:06 sybalsky Exp $ Copyright #define ToMem memcpy #endif /* OS5 */ -rpc(args) +LispPTR rpc(args) LispPTR *args; { #ifndef DOS diff --git a/src/rplcons.c b/src/rplcons.c index 27fdb06..26081c6 100755 --- a/src/rplcons.c +++ b/src/rplcons.c @@ -44,7 +44,7 @@ static char *id = "$Id: rplcons.c,v 1.3 1999/05/31 23:35:41 sybalsky Exp $ Copyr /***************************************************/ -N_OP_rplcons(register LispPTR list, register LispPTR item) +LispPTR N_OP_rplcons(register LispPTR list, register LispPTR item) { register struct conspage *conspage ; register ConsCell *new_cell , *list68k; diff --git a/src/setsout.c b/src/setsout.c index b24b6cf..fd3c6bb 100755 --- a/src/setsout.c +++ b/src/setsout.c @@ -48,29 +48,10 @@ extern int errno; /* JDS protoize char *valloc(size_t); */ -main(int argc, char **argv) -{ - int version, res; - if (argc < 3) - { - printf("setsysout version sysout-name\n"); - return(-1); - } - if ((version = atoi(argv[1])) == 0) - { - printf("version must be an integer > 0.\n"); - return(-1); - } - set_sysout(version, argv[2]); - exit(0); - } - -set_sysout(int version, char *sysout_file_name) +void set_sysout(int version, char *sysout_file_name) { int sysout; /* SysoutFile descriptor */ - IFPAGE ifpage; /* IFPAGE */ - char errmsg [ 255 ]; /* @@ -115,7 +96,23 @@ set_sysout(int version, char *sysout_file_name) exit(-1); } - close(sysout); printf("%d", ifpage.minbversion); } + +int main(int argc, char **argv) +{ + int version, res; + if (argc < 3) + { + printf("setsysout version sysout-name\n"); + return(-1); + } + if ((version = atoi(argv[1])) == 0) + { + printf("version must be an integer > 0.\n"); + return(-1); + } + set_sysout(version, argv[2]); + exit(0); + } diff --git a/src/shift.c b/src/shift.c index 2e0d6c6..f735f39 100755 --- a/src/shift.c +++ b/src/shift.c @@ -31,13 +31,18 @@ static char *id = "$Id: shift.c,v 1.3 1999/05/31 23:35:42 sybalsky Exp $ Copyrig DLword *createcell68k(unsigned int type); +/* + * XXX: it feels as though something is not clean here, looks like the + * "int a" arguments are really LispPTR types, though perhaps it doesn't + * matter. NBriggs, May 2017 + */ /************************************************************ N_OP_llsh1 entry LLSH1 OPCODE[0340] return(a << 1) ************************************************************/ -N_OP_llsh1(int a) +LispPTR N_OP_llsh1(int a) { N_ARITH_BODY_1_UNSIGNED(a, 1, <<); } @@ -47,7 +52,7 @@ N_OP_llsh8 entry LLSH8 OPCODE[0341] return(a << 8) ************************************************************/ -N_OP_llsh8(int a) +LispPTR N_OP_llsh8(int a) { N_ARITH_BODY_1_UNSIGNED(a, 8, <<); } @@ -57,7 +62,7 @@ N_OP_lrsh1 entry LRSH1 OPCODE[0342] return(a >> 1) ************************************************************/ -N_OP_lrsh1(int a) +LispPTR N_OP_lrsh1(int a) { N_ARITH_BODY_1_UNSIGNED(a, 1, >>); } @@ -67,7 +72,7 @@ N_OP_lrsh8 entry LRSH8 OPCODE[0343] return(a >> 8) ************************************************************/ -N_OP_lrsh8(int a) +LispPTR N_OP_lrsh8(int a) { N_ARITH_BODY_1_UNSIGNED(a, 8, >>); } @@ -77,7 +82,7 @@ N_OP_lsh entry LSH OPCODE[0347] return(a b) ************************************************************/ -N_OP_lsh(int a, int b) +LispPTR N_OP_lsh(int a, int b) { register int arg,arg2; register int size; diff --git a/src/storage.c b/src/storage.c index c9f9d0b..6031bea 100755 --- a/src/storage.c +++ b/src/storage.c @@ -1,5 +1,5 @@ /* $Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ -static char *id = "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyright (C) Venue"; +static const char *id = "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyright (C) Venue"; @@ -45,6 +45,8 @@ static char *id = "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyr #define IFPVALID_KEY 5603 +void advance_array_seg(register unsigned int nxtpage); +void set_storage_state(void); /*****************************************************************/ @@ -54,15 +56,16 @@ static char *id = "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyr Created : Oct. 7, 1987 Takeshi Shimizu Changed : Oct. 12,1987 take + Used to be LispPTR T/NIL return, but result never used */ /*****************************************************************/ -checkfor_storagefull(register unsigned int npages) +void checkfor_storagefull(register unsigned int npages) { register int pagesleft; register INTSTAT *int_state; - DLword advance_storagestate(DLword flg); + void advance_storagestate(DLword flg); #ifdef BIGVM pagesleft = (*Next_MDSpage_word ) - @@ -104,7 +107,7 @@ checkfor_storagefull(register unsigned int npages) #ifdef DEBUG printf("\n checkfor_storagefull:DORECLAIM.....\n"); #endif - return(NIL); + return; /*(NIL); */ break; @@ -116,7 +119,8 @@ checkfor_storagefull(register unsigned int npages) *LeastMDSPage_word= *Next_Array_word; *Next_MDSpage_word= *SecondMDSPage_word; advance_storagestate(SFS_FULLYSWITCHED); - return(advance_array_seg((*SecondArrayPage_word))); + advance_array_seg(*SecondArrayPage_word); + return; } } else if (npages > pagesleft) @@ -125,7 +129,8 @@ checkfor_storagefull(register unsigned int npages) but leave MDS to fill the rest of the low pages */ *LeastMDSPage_word= *Next_Array_word; advance_storagestate(SFS_ARRAYSWITCHED); - return(advance_array_seg((*SecondArrayPage_word))); + advance_array_seg(*SecondArrayPage_word); + return; } break ; #ifdef BIGVM @@ -137,8 +142,9 @@ checkfor_storagefull(register unsigned int npages) #endif { *Next_MDSpage_word= *SecondMDSPage_word; - return(advance_storagestate - (SFS_FULLYSWITCHED)); + advance_storagestate + (SFS_FULLYSWITCHED); + return; } else if (npages != NIL) if((npages + GUARDSTORAGEFULL) >= @@ -149,17 +155,17 @@ checkfor_storagefull(register unsigned int npages) ((*SecondMDSPage_word & 0xffff)- (*Next_Array_word & 0xffff))) #endif - return(NIL); - return(T); + return; /* (NIL); */ + return; /* (T); */ /* break; */ - default : error("checkfor_storagefull: Shouldn't <%d>",(*STORAGEFULLSTATE_word) & 0xffff); + default : error("checkfor_storagefull: Shouldn't"); /* (*STORAGEFULLSTATE_word) & 0xffff) */ break; } } else - return(NIL); + return; /*(NIL); */ }/* checkfor_storagefull end */ /*****************************************************************/ @@ -172,7 +178,7 @@ checkfor_storagefull(register unsigned int npages) */ /*****************************************************************/ -advance_array_seg(register unsigned int nxtpage) +void advance_array_seg(register unsigned int nxtpage) /* rare page num */ { @@ -215,7 +221,7 @@ else *ArrayFrLst_word = nxtpage << 8 ; *ArraySpace2_word = *ArrayFrLst_word; - return(S_POSITIVE); + /* return(S_POSITIVE); making function void as result never used */ } /* advance_array_seg end */ @@ -229,8 +235,8 @@ else */ /*****************************************************************/ -DLword -advance_storagestate(DLword flg) +/* DLword */ +void advance_storagestate(DLword flg) { LispPTR dremove(LispPTR x, LispPTR l); #ifdef DEBUG @@ -251,7 +257,7 @@ advance_storagestate(DLword flg) */ /*****************************************************************/ -set_storage_state(void) +void set_storage_state(void) { LispPTR cons(LispPTR cons_car, LispPTR cons_cdr); @@ -438,7 +444,7 @@ LispPTR newpage(LispPTR base) Changed : */ /*****************************************************************/ -init_storage(void) +void init_storage(void) { #ifdef BIGVM diff --git a/src/subr0374.c b/src/subr0374.c index 36bb8b6..06d4724 100755 --- a/src/subr0374.c +++ b/src/subr0374.c @@ -16,6 +16,13 @@ static char *id = "$Id: subr0374.c,v 1.3 1999/05/31 23:35:43 sybalsky Exp $ Copy #include "version.h" +/* + * This doesn't appear to be used anywhere. + * Adjusted result to be LispPTR and return value to NIL instead of + * being an int/return 0. + * + * NBriggs, May 2017 + */ /********************************************************/ /* @@ -33,7 +40,7 @@ static char *id = "$Id: subr0374.c,v 1.3 1999/05/31 23:35:43 sybalsky Exp $ Copy #include "adr68k.h" #include "lspglob.h" -subr_k_trace(LispPTR *args) +LispPTR subr_k_trace(LispPTR *args) { int len; char *base; @@ -43,6 +50,6 @@ subr_k_trace(LispPTR *args) while(len-- > 0) putc(*base++ , stderr); putc('\n', stderr); - return(0); + return (NIL); } diff --git a/src/sxhash.c b/src/sxhash.c index 464fc93..d2dbda4 100755 --- a/src/sxhash.c +++ b/src/sxhash.c @@ -41,6 +41,14 @@ static char *id = "$Id: sxhash.c,v 1.4 2001/12/24 01:09:06 sybalsky Exp $ Copyri #define EQHASHINGBITS(item) ( (((item)>>16)&0xFFFF) ^ ( (((item)&0x1FFF)<<3) ^ (((item)>>9)& 0x7f) ) ) +unsigned short sxhash (LispPTR obj); +unsigned short sxhash_rotate(short unsigned int value); +unsigned short sxhash_string(OneDArray *obj); +unsigned short sxhash_bitvec(OneDArray *obj); +unsigned short sxhash_list(LispPTR obj); +unsigned short sxhash_pathname(LispPTR obj); +unsigned short stringequalhash(LispPTR obj); +unsigned short stringhash(LispPTR obj); /****************************************************************/ @@ -70,7 +78,7 @@ LispPTR SX_hash (register SXHASHARG *args) /* Fails to handle ratios, complex's, bitvectors pathnames & odd */ /* cases */ /*****************************************************************/ -sxhash (LispPTR obj) +unsigned short sxhash (LispPTR obj) { /* unsigned short hashOffset; Not Used */ unsigned int cell; @@ -133,8 +141,7 @@ sxhash (LispPTR obj) #ifndef SUN3_OS3_OR_OS4_IL /* Rotates the 16-bit work to the left 7 bits (or to the right 9 bits) */ -short unsigned -sxhash_rotate(short unsigned int value) +unsigned short sxhash_rotate(short unsigned int value) { return ((value<<7) | ((value>>9) & 0x7f)); } @@ -142,7 +149,7 @@ sxhash_rotate(short unsigned int value) #endif -sxhash_string(OneDArray *obj) +unsigned short sxhash_string(OneDArray *obj) { unsigned i, len, offset; register unsigned short hash = 0; @@ -177,7 +184,7 @@ sxhash_string(OneDArray *obj) return(hash); } -sxhash_bitvec(OneDArray *obj) +unsigned short sxhash_bitvec(OneDArray *obj) { unsigned short *base; unsigned i, len, offset, bitoffset; @@ -200,7 +207,7 @@ sxhash_bitvec(OneDArray *obj) } -sxhash_list(LispPTR obj) +unsigned short sxhash_list(LispPTR obj) { unsigned short hash = 0; int counter; @@ -212,7 +219,7 @@ sxhash_list(LispPTR obj) return(hash); } -sxhash_pathname(LispPTR obj) +unsigned short sxhash_pathname(LispPTR obj) { unsigned short hash = 0; PATHNAME *path; @@ -240,7 +247,7 @@ LispPTR STRING_EQUAL_HASHBITS(SXHASHARG *args) return(S_POSITIVE | ( 0xFFFF & (stringequalhash(args->object)))); } /* STRING_EQUAL_HASHBITS */ -stringequalhash(LispPTR obj) +unsigned short stringequalhash(LispPTR obj) { unsigned i, len, offset, fatp, ind; register unsigned short hash = 0; @@ -319,7 +326,7 @@ LispPTR STRING_HASHBITS(SXHASHARG *args) return(S_POSITIVE | ( 0xFFFF & (stringhash(args->object)))); } /* STRING_HASHBITS */ -stringhash(LispPTR obj) +unsigned short stringhash(LispPTR obj) { unsigned i, len, offset, fatp, ind; register unsigned short hash = 0; diff --git a/src/testtool.c b/src/testtool.c index 49563a5..8f6f69e 100755 --- a/src/testtool.c +++ b/src/testtool.c @@ -119,7 +119,7 @@ void print_atomname(LispPTR index) #define PACKAGES_LIMIT 255 /** GET PACKAGE INDEX from PACKAGE FULL NAME */ -find_package_from_name(char *packname, int len) +int find_package_from_name(char *packname, int len) { int index; PACKAGE *package; @@ -316,7 +316,7 @@ void check_type_68k(int type, LispPTR *ptr) /* */ /************************************************************************/ -type_num(LispPTR lispptr) +int type_num(LispPTR lispptr) { int type; type = GetTypeNumber(lispptr); @@ -552,7 +552,7 @@ char * opcode_table[256] = }; -print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) +int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) { /* Print the opcode at addr, including args, and return length */ /* if this opcode is the last, return -1 */ @@ -760,7 +760,7 @@ void printPC(void) /***************************/ -countchar(char *string) +int countchar(char *string) { int cnt=0; @@ -928,7 +928,7 @@ loop: goto loop; } /*end btv*/ -get_framename(struct frameex1 *fx_addr68k) +int get_framename(struct frameex1 *fx_addr68k) { struct fnhead *fnheader; LispPTR scratch; @@ -973,7 +973,7 @@ FX *get_nextFX(FX *fx) -MAKEATOM(char *string) +int MAKEATOM(char *string) { int length; length = countchar(string); @@ -1013,7 +1013,7 @@ DLword *MakeAtom68k(char *string) /* Print the top-level value of a given atom; for use in dbx. */ /* */ /************************************************************************/ -GETTOPVAL(char *string) +void GETTOPVAL(char *string) { int index; LispPTR *cell68k; @@ -1038,7 +1038,7 @@ GETTOPVAL(char *string) /* */ /************************************************************************/ -S_TOPVAL(char *string) +void S_TOPVAL(char *string) { int index; LispPTR *cell68k; @@ -1058,7 +1058,7 @@ S_TOPVAL(char *string) /***************/ -S_MAKEATOM(char *string) +int S_MAKEATOM(char *string) { int index=0; int length; diff --git a/src/timer.c b/src/timer.c index 20a1093..ac1b575 100755 --- a/src/timer.c +++ b/src/timer.c @@ -158,6 +158,8 @@ int Event_Req = FALSE; #define SIGERRCHK(set, str) if (set == SIG_ERR) perror(str) +void update_miscstats(); + /************************************************************************/ /* */ /* i n i t _ m i s c s t a t s */ @@ -168,7 +170,7 @@ int Event_Req = FALSE; /* */ /************************************************************************/ -init_miscstats() +void init_miscstats() { MiscStats->starttime = gettime(0); MiscStats->gctime = 0; @@ -187,7 +189,7 @@ init_miscstats() /* */ /************************************************************************/ -update_miscstats() +void update_miscstats() { #ifdef DOS struct dostime_t dtm; /* holds DOS time, so we can get .01 secs */ @@ -378,7 +380,7 @@ int gettime(casep) /* */ /************************************************************************/ -subr_settime(args) +void subr_settime(args) LispPTR args[]; { #ifdef DOS @@ -427,7 +429,7 @@ subr_settime(args) /* */ /************************************************************************/ -subr_copytimestats(args) +void subr_copytimestats(args) LispPTR args[]; { MISCSTATS *source; @@ -491,7 +493,7 @@ LispPTR N_OP_rclk(tos) /* */ /************************************************************************/ -update_timer() +void update_timer() { #ifdef USETIMEFN MiscStats -> secondstmp = MiscStats->secondsclock @@ -848,8 +850,8 @@ void int_unblock() #endif /* DOS */ } -int_timer_on () {int_unblock();} -int_timer_off() {int_block ();} +void int_timer_on () {int_unblock();} +void int_timer_off() {int_block ();} /************************************************************************/ @@ -1253,7 +1255,7 @@ void int_init() int_timer_init(); /* periodic interrupt timer */ int_io_init(); /* SIGIO and SIGPOLL async I/O handlers */ int_file_init(); /* file-io TIMEOUT support */ - int_panic_init(); /* catch for all other dangerous interrupts */ + /* int_panic_init(); /* catch for all other dangerous interrupts */ #ifdef FLTINT int_fp_init(); /* Floating-point exception handler */ diff --git a/src/tstsout.c b/src/tstsout.c index 82c965a..43a6404 100755 --- a/src/tstsout.c +++ b/src/tstsout.c @@ -42,18 +42,7 @@ extern int errno; /* JDS protoize char *valloc(size_t); */ -main(int argc, char **argv) -{ - if (argc != 2) - { - printf("You forgot to supply a file name."); - return(-1); - } - check_sysout(argv[1]); - exit(0); - } - -check_sysout(char *sysout_file_name) +void check_sysout(char *sysout_file_name) { int sysout; /* SysoutFile descriptor */ @@ -91,3 +80,15 @@ check_sysout(char *sysout_file_name) close(sysout); printf("%d", ifpage.minbversion); } + +int main(int argc, char **argv) +{ + if (argc != 2) + { + printf("You forgot to supply a file name."); + return(-1); + } + check_sysout(argv[1]); + exit(0); +} + diff --git a/src/ubf1.c b/src/ubf1.c index 6560be0..632d87d 100755 --- a/src/ubf1.c +++ b/src/ubf1.c @@ -37,7 +37,7 @@ static char *id = "$Id: ubf1.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyrigh 355/4 UFIX ***********************************************************/ -N_OP_ubfloat1(int arg, int alpha) +LispPTR N_OP_ubfloat1(int arg, int alpha) { switch (alpha) { case 0: /* box */ diff --git a/src/ubf2.c b/src/ubf2.c index 716c109..7d30a50 100755 --- a/src/ubf2.c +++ b/src/ubf2.c @@ -42,7 +42,7 @@ static char *id = "$Id: ubf2.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyrigh 354/8 REM 354/9 AREF ***********************************************************/ -N_OP_ubfloat2(int a2, int a1, int alpha) +LispPTR N_OP_ubfloat2(int a2, int a1, int alpha) { REGISTER float arg1, arg2; float ans; diff --git a/src/ubf3.c b/src/ubf3.c index 90d95e4..8d4d408 100755 --- a/src/ubf3.c +++ b/src/ubf3.c @@ -34,7 +34,7 @@ static char *id = "$Id: ubf3.c,v 1.3 1999/05/31 23:35:45 sybalsky Exp $ Copyrigh 062/0 POLY ***********************************************************/ -N_OP_ubfloat3(int arg3, LispPTR arg2, LispPTR arg1, int alpha) +LispPTR N_OP_ubfloat3(int arg3, LispPTR arg2, LispPTR arg1, int alpha) { REGISTER float val; REGISTER float ans; diff --git a/src/ufs.c b/src/ufs.c index ae8f7e6..69b5e76 100755 --- a/src/ufs.c +++ b/src/ufs.c @@ -35,9 +35,11 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright /* Indigo has this duplicated in dirent.h, sigh. */ #ifndef OS5 #ifndef HPUX +#ifndef FREEBSD #include #endif #endif +#endif #endif /* INDIGO */ #include @@ -52,10 +54,10 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #endif /* APOLLO */ #endif /* AIX */ -#ifdef SYSVONLY +#if defined(SYSVONLY) || defined(FREEBSD) #include #include -#endif /* SYSVONLY */ +#endif /* SYSVONLY | FREEBSD */ #include #else /* DOS */ @@ -206,7 +208,7 @@ exit_host_filesystem() * can open the file with the specified mode or not. */ -UFS_getfilename(args) +LispPTR UFS_getfilename(args) register LispPTR *args; { register char *base; @@ -299,7 +301,7 @@ UFS_getfilename(args) * a specified file. */ -UFS_deletefile(args) +LispPTR UFS_deletefile(args) register LispPTR *args; { char file[MAXPATHLEN], fbuf[MAXPATHLEN]; @@ -358,7 +360,7 @@ UFS_deletefile(args) * a specified file. */ -UFS_renamefile(args) +LispPTR UFS_renamefile(args) register LispPTR *args; { char fbuf[MAXPATHLEN], src[MAXPATHLEN], dst[MAXPATHLEN]; @@ -432,7 +434,7 @@ UFS_renamefile(args) * the directory name representation. */ -UFS_directorynamep(args) +LispPTR UFS_directorynamep(args) register LispPTR *args; { char dirname[MAXPATHLEN]; @@ -520,12 +522,12 @@ UFS_directorynamep(args) * */ #ifdef DOS -unixpathname(src, dst, versionp, genp, drive, extlenptr, rawname) +int unixpathname(src, dst, versionp, genp, drive, extlenptr, rawname) char *drive; int *extlenptr; char *rawname; #else -unixpathname(src, dst, versionp, genp) +int unixpathname(src, dst, versionp, genp) #endif /* DOS */ register char *src; register char *dst; @@ -938,7 +940,7 @@ unixpathname(src, dst, versionp, genp) * */ -lisppathname(fullname, lispname, dirp, versionp) +int lisppathname(fullname, lispname, dirp, versionp) register char *fullname; register char *lispname; register int dirp; @@ -1214,7 +1216,7 @@ lisppathname(fullname, lispname, dirp, versionp) * Lisp sense or not. */ -quote_fname(file) +int quote_fname(file) register char *file; { register char *cp, *dp; @@ -1284,6 +1286,7 @@ quote_fname(file) } UnixVersionToLispVersion(namebuf, 1); strcpy(file, namebuf); + return (1); } @@ -1308,7 +1311,7 @@ quote_fname(file) * and being converted to {UNIX} name. */ -quote_fname_ufs(file) +int quote_fname_ufs(file) register char *file; { register char *cp, *dp; @@ -1371,6 +1374,7 @@ quote_fname_ufs(file) *cp = '\0'; } strcpy(file, fbuf); + return (1); } @@ -1393,7 +1397,7 @@ quote_fname_ufs(file) * name. Both {DSK} and {UNIX} uses this routine. */ -quote_dname(dir) +int quote_dname(dir) register char *dir; { register char *cp, *dp; @@ -1426,4 +1430,5 @@ quote_dname(dir) } strcpy(dir, fbuf); + return (1); } diff --git a/src/unixcomm.c b/src/unixcomm.c index d2a1144..6ca49b6 100755 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -187,7 +187,7 @@ int find_process_slot(register int pid) /* */ /************************************************************************/ -wait_for_comm_processes(void) +void wait_for_comm_processes(void) { int pid; int slot; @@ -274,7 +274,7 @@ int desc; /************************************************************************/ -close_unix_descriptors(void) /* Get ready to shut Maiko down */ +void close_unix_descriptors(void) /* Get ready to shut Maiko down */ { int slot; @@ -331,7 +331,7 @@ close_unix_descriptors(void) /* Get ready to shut Maiko down */ /* */ /************************************************************************/ -FindUnixPipes(void) +int FindUnixPipes(void) { char *envtmp, *getenv(const char *); register int i; @@ -398,7 +398,7 @@ FindUnixPipes(void) /* Find the first PTY pair that is not in use */ -FindAvailablePty(char *Master, char *Slave) +int FindAvailablePty(char *Master, char *Slave) { int res, flags; char *let, *num; @@ -447,11 +447,7 @@ FindAvailablePty(char *Master, char *Slave) return(-1); } - - - - - +void WriteLispStringToPipe (LispPTR lispstr); /************************************************************************/ /* */ @@ -495,7 +491,7 @@ FindAvailablePty(char *Master, char *Slave) /************************************************************************/ -Unix_handlecomm(LispPTR *args) +LispPTR Unix_handlecomm(LispPTR *args) { int command,c, dest, PID, i, slot, sock, res; LispPTR retval; @@ -1221,7 +1217,7 @@ printf("Shell job %d, PID = %d\n", slot, UJ[slot].PID); /* */ /************************************************************************/ -WriteLispStringToPipe (LispPTR lispstr) +void WriteLispStringToPipe (LispPTR lispstr) { unsigned short len; LispStringToCString(lispstr, shcom, 2048); /* Write string length, then string */ diff --git a/src/uraid.c b/src/uraid.c index 8f70de3..75f5594 100755 --- a/src/uraid.c +++ b/src/uraid.c @@ -345,7 +345,7 @@ LispPTR make_atom(); */ /***********************************************************************/ -uraid_commclear() +void uraid_commclear() { memset(URaid_inputstring, 0, URMAXCOMM); memset(URaid_arg1, 0, URMAXCOMM/2); @@ -358,7 +358,7 @@ uraid_commclear() -copy_region ( src, dst, width, h ) +void copy_region ( src, dst, width, h ) register short *src, *dst; int width; register int h; @@ -385,7 +385,7 @@ register int h; */ /***********************************************************************/ -uraid_commands() +LispPTR uraid_commands() { int num,address,val,tmp; LispPTR index; @@ -910,7 +910,7 @@ extern struct pixrect *ColorDisplayPixrect,*DisplayRegionPixrect; #endif /* SUNDISPLAY */ -device_before_raid() +int device_before_raid() { int keytrans; int size; @@ -1122,9 +1122,13 @@ int size; */ /***********************************************************************/ +/* + * Seems like a bad return type or bad code, returning 0, -1, or NIL + * NBriggs May 2017 + */ #define KB_ALLUP 0xffff -device_after_raid() +int device_after_raid() { extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K; @@ -1150,7 +1154,7 @@ device_after_raid() perror("after-uraid: I_SETSIG for ether failed:\n"); close(ether_fd); ether_fd = -1; - return(NIL); + return(-1); } #endif /* USE_DLPI */ #endif /* NOETHER */ @@ -1207,7 +1211,7 @@ device_after_raid() /***********************************************************************/ #ifndef COLOR -re_init_display(lisp_display_addr, display_max) +int re_init_display(lisp_display_addr, display_max) int lisp_display_addr, display_max; { int mmapstat, size; diff --git a/src/usrsubr.c b/src/usrsubr.c index c579a6e..2644e93 100755 --- a/src/usrsubr.c +++ b/src/usrsubr.c @@ -19,14 +19,14 @@ static char *id = "$Id: usrsubr.c,v 1.3 1999/05/31 23:35:46 sybalsky Exp $ Copyr #include "version.h" - +#include /** User defined subrs here. Do NOT attempt to use this unless you FULLY understand the dependencies of the LDE architecture. **/ #define DO_UFN {return(-1);} -UserSubr(int user_subr_index, int num_args, int *args) +int UserSubr(int user_subr_index, int num_args, int *args) { int result = 0; diff --git a/src/uutils.c b/src/uutils.c index 28b5f51..adb1c00 100755 --- a/src/uutils.c +++ b/src/uutils.c @@ -163,7 +163,7 @@ int c_string_to_lisp_string(char *C, LispPTR Lisp) /* */ /************************************************************************/ -check_unix_password(LispPTR *args) +LispPTR check_unix_password(LispPTR *args) { #ifndef DOS struct passwd *pwd; @@ -202,7 +202,7 @@ check_unix_password(LispPTR *args) /* */ /************************************************************************/ -unix_username(LispPTR *args) +LispPTR unix_username(LispPTR *args) { #ifndef DOS struct passwd *pwd; @@ -248,7 +248,7 @@ unix_username(LispPTR *args) char* getenv(const char *); -unix_getparm(LispPTR *args) +LispPTR unix_getparm(LispPTR *args) { char envname[20], result[128], *envvalue; if (lisp_string_to_c_string(args[0], envname, sizeof envname)) @@ -380,7 +380,7 @@ unix_getparm(LispPTR *args) /* */ /************************************************************************/ -unix_getenv(LispPTR *args) +LispPTR unix_getenv(LispPTR *args) { char envname[20], *envvalue; if (lisp_string_to_c_string(args[0], envname, sizeof envname)) @@ -403,7 +403,7 @@ unix_getenv(LispPTR *args) /* */ /************************************************************************/ -unix_fullname(LispPTR *args) +LispPTR unix_fullname(LispPTR *args) { #ifndef DOS struct passwd *pwd; @@ -432,7 +432,7 @@ extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, extern DLword *EmKbdAd168K,*EmKbdAd268K,*EmKbdAd368K, *EmKbdAd468K,*EmKbdAd568K; -suspend_lisp(LispPTR *args) +LispPTR suspend_lisp(LispPTR *args) { #ifndef DOS extern DLword *CTopKeyevent; diff --git a/src/vmemsave.c b/src/vmemsave.c index 3f97359..b039356 100755 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -123,7 +123,7 @@ extern int please_fork; /* */ /************************************************************************/ -lispstringP(Lisp) +int lispstringP(Lisp) LispPTR Lisp; { switch( ((OneDArray *)(Addr68k_from_LADDR(Lisp)))->typenumber ) @@ -135,7 +135,7 @@ lispstringP(Lisp) } } - +LispPTR vmem_save(register char *sysout_file_name); /************************************************************************/ /* */ @@ -173,7 +173,7 @@ lispstringP(Lisp) /* */ /************************************************************************/ -vmem_save0(args) +LispPTR vmem_save0(args) register LispPTR *args; { register char *def; @@ -362,8 +362,8 @@ ONE_MORE_TIME: /* Tacky, but why repeat code? */ /* diagnostic flag value to limit the size of write() s */ int maxpages = 65536; -vmem_save(sysout_file_name) - register char *sysout_file_name; +LispPTR vmem_save(sysout_file_name) + register char *sysout_file_name; { int sysout; /* SysoutFile descriptor */ #ifdef BIGVM @@ -642,7 +642,7 @@ extern int UnixPID; /* Make sure that we kill off any Unix subprocesses before we go away */ -lisp_finish() +void lisp_finish() { char d[4]; diff --git a/src/xbbt.c b/src/xbbt.c index 25c4739..888c9d0 100755 --- a/src/xbbt.c +++ b/src/xbbt.c @@ -105,7 +105,7 @@ clipping_Xbitblt(dsp, dummy, x, y, w, h) y - dsp->Vissible.y, w, h ); XFlush(dsp->display_id); XUNLOCK; - return(0); } + return(0); } /* end clipping_Xbitblt */ diff --git a/src/xc.c b/src/xc.c index b0a998f..b1f2425 100755 --- a/src/xc.c +++ b/src/xc.c @@ -169,7 +169,7 @@ int n_mask_array[16] = { 1, 3, 7, 0xf, extern int TIMER_INTERVAL; -dispatch(void) +void dispatch(void) { register InstPtr pccache; @@ -1853,5 +1853,5 @@ FP_noint: DW 003fh ;; No interrupts, round to closest, 24bit precision"); int retfun(void) {return(0);} -do_brk(void) {} +void do_brk(void) {} diff --git a/src/xcursor.c b/src/xcursor.c index e2021ee..7488e8e 100755 --- a/src/xcursor.c +++ b/src/xcursor.c @@ -76,6 +76,8 @@ int Current_Hot_X = 0, Current_Hot_Y = 0; +void set_Xcursor(DspInterface, unsigned char *, int, int, Cursor *, int); + /************************************************************************/ /* */ /* I n i t _ X C u r s o r */ @@ -85,7 +87,7 @@ int Current_Hot_X = 0, /* */ /************************************************************************/ -Init_XCursor() +void Init_XCursor() { int i; DLword *newbm = (DLword *) (IOPage->dlcursorbitmap); @@ -96,7 +98,7 @@ Init_XCursor() cursorlist->next = NULL; for(i=0; ibitmap[i] = newbm[i]; - set_Xcursor( currentdsp, newbm, 0, 0, &(cursorlist->Xid), 1); + set_Xcursor( currentdsp, (unsigned char *)newbm, 0, 0, &(cursorlist->Xid), 1); DefineCursor(currentdsp->display_id, currentdsp->DisplayWindow, &(cursorlist->Xid)); @@ -122,7 +124,7 @@ Init_XCursor() /* */ /************************************************************************/ -Set_XCursor( x, y ) +void Set_XCursor( x, y ) int x, y; { /* compare cursor in IOPage memory with cursors we've seen before */ @@ -145,9 +147,9 @@ Set_XCursor( x, y ) clp->bitmap[i] = newbm[i]; #ifdef NEWXCURSOR /* JDS 000521 Added "15-" to fix cursor troubles at window edge */ - set_Xcursor( currentdsp, newbm, x, 15-y, &(clp->Xid), 1); + set_Xcursor( currentdsp, (unsigned char *) newbm, x, 15-y, &(clp->Xid), 1); #else - set_Xcursor( currentdsp, newbm, 0, 0, &(clp->Xid), 1); + set_Xcursor( currentdsp, (unsigned char *) newbm, 0, 0, &(clp->Xid), 1); #endif /* NEWXCURSOR */ clp->next = cursorlist; cursorlist = clp; @@ -187,7 +189,7 @@ Set_XCursor( x, y ) /* */ /************************************************************************/ -init_Xcursor(display, window) +void init_Xcursor(display, window) Display *display; { @@ -257,7 +259,7 @@ init_Xcursor(display, window) /* */ /************************************************************************/ -set_Xcursor( dsp, bitmap, hotspot_x, hotspot_y, return_cursor, from_lisp ) +void set_Xcursor( dsp, bitmap, hotspot_x, hotspot_y, return_cursor, from_lisp ) DspInterface dsp; unsigned char *bitmap; int hotspot_x diff --git a/src/xlspwin.c b/src/xlspwin.c index 91cebb0..c8d339b 100755 --- a/src/xlspwin.c +++ b/src/xlspwin.c @@ -90,7 +90,7 @@ extern int LispWindowRequestedX, /* */ /************************************************************************/ -Create_LispWindow(dsp) +void Create_LispWindow(dsp) DspInterface dsp; { XSizeHints szhint; @@ -418,7 +418,7 @@ Create_LispWindow(dsp) } -lisp_Xvideocolor( flag ) +void lisp_Xvideocolor( flag ) int flag; { XLOCK; @@ -447,7 +447,7 @@ int flag; extern int Current_Hot_X, Current_Hot_Y; /* Cursor hotspot */ -set_Xmouseposition( x, y ) +void set_Xmouseposition( x, y ) int x , y; { @@ -481,7 +481,7 @@ set_Xmouseposition( x, y ) /* */ /************************************************************************/ -DoRing() +void DoRing() { DLword w , r; diff --git a/src/xmkicon.c b/src/xmkicon.c index daa9932..56393ba 100755 --- a/src/xmkicon.c +++ b/src/xmkicon.c @@ -51,7 +51,7 @@ extern char iconpixmapfile[1024]; /* */ /************************************************************************/ -make_Xicon( dsp ) +Pixmap make_Xicon( dsp ) DspInterface dsp; { unsigned int width, height; diff --git a/src/xrdopt.c b/src/xrdopt.c index ccd8f5b..338dd91 100755 --- a/src/xrdopt.c +++ b/src/xrdopt.c @@ -123,6 +123,52 @@ extern struct sockaddr_nit snit; #endif /* USE_DLPI */ #endif /* NOETHER */ +/************************************************************************/ +/* */ +/* p r i n t _ X u s a g e */ +/* */ +/* Print out command-line options for X, to help user. */ +/* */ +/************************************************************************/ + +void print_Xusage( prog ) + char *prog; + { + fprintf(stderr, " %s options:\n", prog); + fprintf(stderr, " [-sysout] [] -path to the Medley image\n"); + fprintf(stderr, " -k[ey] -see manual for details\n"); + fprintf(stderr, " -h[elp] -prints this text\n"); + fprintf(stderr, " -d[isplay] :.\n"); + fprintf(stderr, " -g[eometry] -size & placement for the medley window on your X screen\n"); + fprintf(stderr, " -sc[reen] -size & placement for the medley display\n"); + fprintf(stderr, " -t[itle] -titlebar text for the window manager\n"); + fprintf(stderr, " -icontitle | -it -text for the medley icon\n"); + fprintf(stderr, " -iconbitmap | -ibm -bitmap for the medley icon\n"); + fprintf(stderr, " -xsync -turn XSyncronize on. (default is off)\n\n"); + fprintf(stderr, "If you have any further questions, please refer to the manual or\n"); + fprintf(stderr, "call our tech support at (800)228-5325 or (510)763-0516.\n\n"); + exit(0); + } /* end print_Xusage() */ + +/************************************************************************/ +/* */ +/* p r i n t _ l i s p u s a g e */ +/* */ +/* Print out command-line usage info if user enters wrong stuff. */ +/* */ +/************************************************************************/ + +void print_lispusage( prog ) + char *prog; + { + TPRINT(( "TRACE: print_lisp_usage()\n" )); + + /* Lisp Option */ + fprintf(stderr,"lde[ether] [sysout] [-k access-key]"); + fprintf(stderr," [-E ]"); + fprintf(stderr,"\n"); + + } /* end print_lisp_usage() */ /************************************************************************/ /* */ @@ -390,53 +436,3 @@ void read_Xoption( argc, argv ) } /* end readXoption */ - -/************************************************************************/ -/* */ -/* p r i n t _ l i s p u s a g e */ -/* */ -/* Print out command-line usage info if user enters wrong stuff. */ -/* */ -/************************************************************************/ - -print_lispusage( prog ) - char *prog; - { - TPRINT(( "TRACE: print_lisp_usage()\n" )); - - /* Lisp Option */ - fprintf(stderr,"lde[ether] [sysout] [-k access-key]"); - fprintf(stderr," [-E ]"); - fprintf(stderr,"\n"); - - } /* end print_lisp_usage() */ - - - - -/************************************************************************/ -/* */ -/* p r i n t _ X u s a g e */ -/* */ -/* Print out command-line options for X, to help user. */ -/* */ -/************************************************************************/ - -print_Xusage( prog ) - char *prog; - { - fprintf(stderr, " %s options:\n", prog); - fprintf(stderr, " [-sysout] [] -path to the Medley image\n"); - fprintf(stderr, " -k[ey] -see manual for details\n"); - fprintf(stderr, " -h[elp] -prints this text\n"); - fprintf(stderr, " -d[isplay] :.\n"); - fprintf(stderr, " -g[eometry] -size & placement for the medley window on your X screen\n"); - fprintf(stderr, " -sc[reen] -size & placement for the medley display\n"); - fprintf(stderr, " -t[itle] -titlebar text for the window manager\n"); - fprintf(stderr, " -icontitle | -it -text for the medley icon\n"); - fprintf(stderr, " -iconbitmap | -ibm -bitmap for the medley icon\n"); - fprintf(stderr, " -xsync -turn XSyncronize on. (default is off)\n\n"); - fprintf(stderr, "If you have any further questions, please refer to the manual or\n"); - fprintf(stderr, "call our tech support at (800)228-5325 or (510)763-0516.\n\n"); - exit(0); - } /* end print_Xusage() */ diff --git a/src/xscroll.c b/src/xscroll.c index 77479dc..f92688a 100755 --- a/src/xscroll.c +++ b/src/xscroll.c @@ -30,47 +30,11 @@ static char *id = "$Id: xscroll.c,v 1.2 1999/01/03 02:07:48 sybalsky Exp $ Copyr int ScrollPitch = SCROLL_PITCH; -JumpScrollVer( dsp, y ) - DspInterface dsp; -{ - Scroll( dsp, dsp->Vissible.x, (int)((dsp->Display.width *y) / dsp->Vissible.height)); -} - -JumpScrollHor( dsp, x ) - DspInterface dsp; -{ - Scroll( dsp, (int)((dsp->Display.width *x) / dsp->Vissible.width), dsp->Vissible.y); -} - -ScrollLeft( dsp ) - DspInterface dsp; -{ - Scroll( dsp, dsp->Vissible.x - ScrollPitch, dsp->Vissible.y); -} - -ScrollRight( dsp ) - DspInterface dsp; -{ - Scroll( dsp, dsp->Vissible.x + ScrollPitch, dsp->Vissible.y); -} - -ScrollUp( dsp ) - DspInterface dsp; -{ - Scroll( dsp, dsp->Vissible.x, dsp->Vissible.y - ScrollPitch); -} - -ScrollDown( dsp ) - DspInterface dsp; -{ - Scroll( dsp, dsp->Vissible.x, dsp->Vissible.y + ScrollPitch); -} - /* Move the DisplayWindow and the ScrollButtons to a new */ /* position. newX, newY refers to the uppre left corner */ /* of the LispDisplay */ -Scroll( dsp, newX, newY) +void Scroll( dsp, newX, newY) DspInterface dsp; int newX, newY; { @@ -87,3 +51,39 @@ Scroll( dsp, newX, newY) (dsp->bitblt_to_screen)( dsp, 0, dsp->Vissible.x, dsp->Vissible.y, dsp->Vissible.width, dsp->Vissible.height); }/* end Scroll */ + +void JumpScrollVer( dsp, y ) + DspInterface dsp; +{ + Scroll( dsp, dsp->Vissible.x, (int)((dsp->Display.width *y) / dsp->Vissible.height)); +} + +void JumpScrollHor( dsp, x ) + DspInterface dsp; +{ + Scroll( dsp, (int)((dsp->Display.width *x) / dsp->Vissible.width), dsp->Vissible.y); +} + +void ScrollLeft( dsp ) + DspInterface dsp; +{ + Scroll( dsp, dsp->Vissible.x - ScrollPitch, dsp->Vissible.y); +} + +void ScrollRight( dsp ) + DspInterface dsp; +{ + Scroll( dsp, dsp->Vissible.x + ScrollPitch, dsp->Vissible.y); +} + +void ScrollUp( dsp ) + DspInterface dsp; +{ + Scroll( dsp, dsp->Vissible.x, dsp->Vissible.y - ScrollPitch); +} + +void ScrollDown( dsp ) + DspInterface dsp; +{ + Scroll( dsp, dsp->Vissible.x, dsp->Vissible.y + ScrollPitch); +} diff --git a/src/z2.c b/src/z2.c index 8ae0da1..89aea82 100755 --- a/src/z2.c +++ b/src/z2.c @@ -48,7 +48,7 @@ static char *id = "$Id: z2.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyright struct cadr_cell cadr(LispPTR cell_adr); /* N_OP_classoc() OP 33Q */ -N_OP_classoc(LispPTR key, LispPTR list) +LispPTR N_OP_classoc(LispPTR key, LispPTR list) { REGISTER struct cadr_cell cadr1; register LispPTR cdrcell; /* address of (cdr A-list); Lisp address */ @@ -92,7 +92,7 @@ register LispPTR cdrcell; /* address of (cdr A-list); Lisp address */ } /* end N_OP_classoc() */ /* (CL:FMEMB item list) OP 35Q */ -N_OP_clfmemb(register LispPTR item, register LispPTR list) +LispPTR N_OP_clfmemb(register LispPTR item, register LispPTR list) { /* OP 35Q */ @@ -169,7 +169,7 @@ fin: DelRef tail ***********************************************************/ -N_OP_restlist(register LispPTR tail, register int last, register int skip) +LispPTR N_OP_restlist(register LispPTR tail, register int last, register int skip) { last &= 0xFFFF;