From a481057fbe4579f1f24db6b25cbec686dd120a0d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 4 Jan 2021 12:58:16 +0700 Subject: [PATCH] Fix unused variable warnings. (#173) --- src/bbtsub.c | 26 ++++++++++++++++++++------ src/bitblt.c | 2 ++ src/conspage.c | 5 ++++- src/dir.c | 9 ++++++--- src/draw.c | 5 ++++- src/dspsubrs.c | 2 ++ src/fp.c | 2 -- src/gccode.c | 2 +- src/gcfinal.c | 4 ++-- src/gchtfind.c | 3 --- src/gcmain3.c | 2 -- src/gcr.c | 1 - src/gcrcell.c | 2 -- src/initsout.c | 5 ++--- src/lineblt8.c | 2 -- src/mkatom.c | 6 +++--- src/unixcomm.c | 11 ++++------- src/unixfork.c | 3 +-- src/vmemsave.c | 4 +++- src/xc.c | 5 ++--- 20 files changed, 56 insertions(+), 45 deletions(-) diff --git a/src/bbtsub.c b/src/bbtsub.c index 02c3d4f..fe73a90 100644 --- a/src/bbtsub.c +++ b/src/bbtsub.c @@ -930,7 +930,10 @@ LispPTR bitshade_bitmap(LispPTR *args) { int right, top, destbits, left, bottom; LispPTR operation, texture; DLword *srcbase, *dstbase, *base; - int dty, slx, dstbpl, op, src_comp, displayflg = 0; + int dty, slx, dstbpl, op, src_comp; +#ifdef REALCURSOR + int displayflg = 0; +#endif int rasterwidth; int num_gray, curr_gray_line; DLword grayword[4]; @@ -1171,12 +1174,16 @@ void bltchar(LispPTR *args) register PILOTBBT *pbt; register DISPLAYDATA *dspdata; int base; +#ifdef REALCURSOR register int displayflg; - +#endif int w, h; int backwardflg = 0, sx, dx, srcbpl, dstbpl, src_comp, op; DLword *srcbase, *dstbase; - int gray = 0, num_gray = 0, curr_gray_line = 0; + int gray = 0; +#ifdef NEWBITBLT + int num_gray = 0, curr_gray_line = 0; +#endif pbt = (PILOTBBT *)Addr68k_from_LADDR(((BLTC *)args)->pilotbbt); dspdata = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTC *)args)->displaydata); @@ -1453,10 +1460,15 @@ void newbltchar(LispPTR *args) { int lmargin, rmargin, xoff; int base; int h, w; +#ifdef REALCURSOR int displayflg; +#endif int backwardflg = 0, sx, dx, srcbpl, dstbpl, src_comp, op; DLword *srcbase, *dstbase; - int gray = 0, num_gray = 0, curr_gray_line = 0; + int gray = 0; +#ifdef NEWBITBLT + int num_gray = 0, curr_gray_line = 0; +#endif displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTARG *)args)->displaydata); @@ -1918,7 +1930,6 @@ void ccfuncall(register unsigned int atom_index, register int argnum, register i register short pv_num; /* scratch for pv */ register struct fnhead *tmp_fn; int rest; /* use for arignments */ - int closurep = NIL; /* Get Next Block offset from argnum */ CURRENTFX->nextblock = (LADDR_from_68k(CurrentStackPTR) & 0x0ffff) - (argnum << 1) + 4 /* +3 */; @@ -2019,7 +2030,10 @@ void tedit_bltchar(LispPTR *args) int h, w; int sx, dx, srcbpl, dstbpl, src_comp, op; DLword *srcbase, *dstbase; - int gray = 0, num_gray = 0, curr_gray_line = 0; + int gray = 0; +#ifdef NEWBITBLT + int num_gray = 0, curr_gray_line = 0; +#endif displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((TBLTARG *)args)->displaydata); if (displaydata68k->ddcharset != ((TBLTARG *)args)->charset) { diff --git a/src/bitblt.c b/src/bitblt.c index a900a56..348f8d1 100644 --- a/src/bitblt.c +++ b/src/bitblt.c @@ -71,7 +71,9 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos) { PILOTBBT *pbt; DLword *srcbase, *dstbase; +#if defined(SUNDISPLAY) || defined(DOS) int displayflg; +#endif int sx, dx, w, h, srcbpl, dstbpl, backwardflg; int src_comp, op, gray, num_gray, curr_gray_line; diff --git a/src/conspage.c b/src/conspage.c index 5d1b478..66bd2d9 100644 --- a/src/conspage.c +++ b/src/conspage.c @@ -298,7 +298,10 @@ LispPTR N_OP_cons(register int cons_car, register int cons_cdr) { extern struct dtd *ListpDTD; register struct conspage *new_conspage; - register ConsCell *new_cell, *temp_cell; + register ConsCell *new_cell; +#ifndef NEWCDRCODING + register ConsCell *temp_cell; +#endif register int new_page; /* hold the return val of nextconspage ,DL->int */ GCLOOKUP(cons_cdr &= POINTERMASK, ADDREF); diff --git a/src/dir.c b/src/dir.c index 1f77d1d..311d5fb 100644 --- a/src/dir.c +++ b/src/dir.c @@ -988,7 +988,7 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf) register FINFO *nextp; int n, len, rval; struct find_t dirp; - register struct passwd *pwd; + /* register struct passwd *pwd; -- From author support */ struct stat sbuf; char namebuf[MAXPATHLEN]; @@ -1075,7 +1075,7 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf) int n, rval; size_t len; DIR *dirp; - register struct passwd *pwd; + /* register struct passwd *pwd; -- From author support */ struct stat sbuf; char namebuf[MAXPATHLEN]; @@ -2028,7 +2028,10 @@ typedef struct ufsgfs { LispPTR COM_gen_files(register LispPTR *args) { char fbuf[MAXPATHLEN + 5], dir[MAXPATHLEN], pattern[MAXPATHLEN]; - char host[MAXNAMLEN], name[MAXNAMLEN], ver[VERSIONLEN], drive[1]; + char host[MAXNAMLEN], name[MAXNAMLEN], ver[VERSIONLEN]; +#ifdef DOS + char drive[1]; +#endif int dskp, count, highestp, propp, fid, version; register char *cp; FINFO *fp; diff --git a/src/draw.c b/src/draw.c index b654fcf..abbdf1a 100644 --- a/src/draw.c +++ b/src/draw.c @@ -302,7 +302,10 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int (start_addr < DisplayRegion68k_end_addr) && ((int)(temp_e = (DLword *)(dataptr - DisplayRegion68k)) >= 0) && ((DLword *)dataptr < DisplayRegion68k_end_addr)) { - int start_x, start_y, end_x, end_y, w, h, displayflg; + int start_x, start_y, end_x, end_y, w, h; +#if defined(SUNDISPLAY) && defined(OLD_CURSOR) + int displayflg; +#endif start_y = (int)temp_s / DisplayRasterWidth; start_x = ((int)temp_s % DisplayRasterWidth) * BITSPER_DLWORD; diff --git a/src/dspsubrs.c b/src/dspsubrs.c index d1f6646..ec684b5 100644 --- a/src/dspsubrs.c +++ b/src/dspsubrs.c @@ -100,7 +100,9 @@ void DSP_Cursor(LispPTR *args, int argnum) extern int ScreenLocked; extern DLword *EmCursorX68K, *EmCursorY68K; extern int LastCursorX, LastCursorY; +#if !defined(OLD_CURSOR) static int Init = T; +#endif #ifdef SUNDISPLAY if (argnum == 2) { diff --git a/src/fp.c b/src/fp.c index a351951..66ceb96 100644 --- a/src/fp.c +++ b/src/fp.c @@ -155,8 +155,6 @@ LispPTR N_OP_fquotient(LispPTR parg1, LispPTR parg2) { LispPTR N_OP_fgreaterp(LispPTR parg1, LispPTR parg2) { REGISTER float arg1, arg2; - register DLword *wordp; - register LispPTR lptr; N_MakeFloat(parg1, arg1, parg2); N_MakeFloat(parg2, arg2, parg2); diff --git a/src/gccode.c b/src/gccode.c index d615757..8c0f68f 100644 --- a/src/gccode.c +++ b/src/gccode.c @@ -188,7 +188,7 @@ LispPTR map_code_pointers(LispPTR codeblock, short int casep) { LispPTR remimplicitkeyhash(LispPTR item, LispPTR ik_hash_table) { Ikhashtbl *ik_htable; - LispPTR reprobe, bits, limits, index, base, value, key_accessor; + LispPTR reprobe, bits, limits, index, base, value; ik_htable = (Ikhashtbl *)Addr68k_from_LADDR(ik_hash_table); bits = Hashingbits(item); limits = ik_htable->last_index; diff --git a/src/gcfinal.c b/src/gcfinal.c index 504b3ff..031048f 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -516,8 +516,8 @@ LispPTR reclaimstackp(LispPTR ptr) /* This is the entry function */ void printarrayblock(LispPTR base) { struct arrayblock *bbase, *btrailer, *ptrailer; - struct arrayblock *bfwd, *bbwd, *rbase; - LispPTR *addr, *tmprover; + struct arrayblock *bfwd, *bbwd; + LispPTR *addr; LispPTR pbase, nbase; diff --git a/src/gchtfind.c b/src/gchtfind.c index ac9332b..380b93e 100644 --- a/src/gchtfind.c +++ b/src/gchtfind.c @@ -257,7 +257,6 @@ void enter_big_reference_count(LispPTR ptr) { void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr) { struct gc_ovfl *oventry; LispPTR tmp; - int tmpcnt; /* ditto comment in entry_big_reference_count */ if (ptr & 1) ptr &= 0xfffffffe; @@ -312,7 +311,6 @@ void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr) { LispPTR htfind(LispPTR ptr, int casep) { register GCENTRY *entry, *link, *prev; register GCENTRY entry_contents, hiptr; - register struct htlinkptr *htlptr; /* if the NOREF bit is on in the type table entry, do not reference count this pointer. Used for non-reference @@ -434,7 +432,6 @@ nolink: /* no match */ LispPTR rec_htfind(LispPTR ptr, int casep) { register GCENTRY *entry, *link, *prev; register GCENTRY entry_contents, hiptr; - register struct htlinkptr *htlptr; /* if the NOREF bit is on in the type table entry, do not reference count this pointer. Used for non-reference diff --git a/src/gcmain3.c b/src/gcmain3.c index cbec762..d40511c 100644 --- a/src/gcmain3.c +++ b/src/gcmain3.c @@ -350,7 +350,6 @@ LispPTR gcmapunscan(void) { register GCENTRY probe; register GCENTRY *entry; GCENTRY offset; - register LispPTR ptr; probe = HTMAIN_ENTRY_COUNT; while ((probe = gcscan2(probe)) != NIL) { @@ -394,7 +393,6 @@ LispPTR gcscanstack(void) { LispPTR scanptr, scanend; UNSIGNED scanend68K; int ftyp; - int pvcount; scanptr = VAG2(STK_HI, InterfacePage->stackbase); scanend = VAG2(STK_HI, InterfacePage->endofstack); diff --git a/src/gcr.c b/src/gcr.c index a177221..fe51cf2 100644 --- a/src/gcr.c +++ b/src/gcr.c @@ -127,7 +127,6 @@ void dogc01(void) { /*!!!!!! should update clock in Miscstats */ void doreclaim(void) { - int gctm1; MISCSTATS gcmisc; if (*GcDisabled_word == NIL) { diff --git a/src/gcrcell.c b/src/gcrcell.c index 3e1b640..b33e0f9 100644 --- a/src/gcrcell.c +++ b/src/gcrcell.c @@ -123,8 +123,6 @@ LispPTR gcreccell(LispPTR cell) { LispPTR ptrfield, carfield; int index, code; LispPTR *field; - int freecnt; - LispPTR freeptr; #ifdef NEWCDRCODING LispPTR to_do[TODO_LIMIT]; /* table of pointers to follow, since Cdr coding lost */ diff --git a/src/initsout.c b/src/initsout.c index f7b2ea8..e0e3f7a 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -436,7 +436,9 @@ void init_for_keyhandle(void) { /************************************************************************/ void init_for_bltchar(void) { +#ifdef COLOR LispPTR index; +#endif char *IL; extern LispPTR *TOPWDS68k; @@ -479,9 +481,6 @@ void init_for_bltchar(void) { /************************************************************************/ void init_for_bitblt(void) { - LispPTR index; - char *IL; - extern LispPTR BITBLTBITMAP_index; extern LispPTR BLTSHADEBITMAP_index; #ifdef COLOR diff --git a/src/lineblt8.c b/src/lineblt8.c index 471bb3d..9400b28 100644 --- a/src/lineblt8.c +++ b/src/lineblt8.c @@ -152,8 +152,6 @@ void lineBlt8(DLword *srcbase, register int offset, register u_char *destl, regi extern DLword PAINT_atom; extern DLword ERASE_atom; - DLword *baseword; /* Assume dest word always quad aligned */ - if (sourcetype == INVERT_atom) { register int tempcol; tempcol = color0; diff --git a/src/mkatom.c b/src/mkatom.c index 6db87dc..a55676c 100644 --- a/src/mkatom.c +++ b/src/mkatom.c @@ -66,8 +66,8 @@ extern DLword *Lisp_world; DLword compute_hash(char *char_base, DLword offset, DLword length) { DLword hash; DLword number; - DLword temp1, temp2; - DLword *word_base; + DLword temp1; + char_base += offset; hash = (int)(*(char_base)) << 8; /* get first byte */ char_base++; /* skip length area */ @@ -97,7 +97,7 @@ DLword compute_hash(char *char_base, DLword offset, DLword length) { DLword compute_lisp_hash(char *char_base, DLword offset, DLword length, DLword fatp) { DLword hash; DLword number; - DLword temp1, temp2; + DLword temp1; DLword *word_base; if (length == 0) return (0); diff --git a/src/unixcomm.c b/src/unixcomm.c index fc0deee..b95dbe3 100644 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -139,7 +139,6 @@ int find_process_slot(register int pid) void wait_for_comm_processes(void) { int pid; int slot; - int res; unsigned char d[5]; d[0] = 'W'; @@ -285,7 +284,6 @@ int FindUnixPipes(void) { int FindAvailablePty(char *Master, char *Slave) { int res; - char *let, *num; res = posix_openpt(O_RDWR); if (res < 0) { @@ -346,9 +344,8 @@ int FindAvailablePty(char *Master, char *Slave) { /************************************************************************/ LispPTR Unix_handlecomm(LispPTR *args) { - int command, c, dest, PID, i, slot, sock, res; - LispPTR retval; - unsigned char d[4], b[1]; + int command, dest, i, slot, sock; + unsigned char d[4]; unsigned char ch; unsigned char buf[1]; @@ -359,8 +356,8 @@ LispPTR Unix_handlecomm(LispPTR *args) { switch (command) { case 0: /* Fork pipe process */ { - char *UpPipeName, *DownPipeName, *PipeName; - int slot, PipeFD, sockFD; + char *PipeName; + int PipeFD, sockFD; /* First create the socket */ struct sockaddr_un sock; diff --git a/src/unixfork.c b/src/unixfork.c index 4a019bf..0060a1c 100644 --- a/src/unixfork.c +++ b/src/unixfork.c @@ -82,13 +82,12 @@ loop: int ForkUnixShell(int slot, char *PtySlave, char *termtype, char *shellarg) { - int res, PID, SlaveFD; + int PID, SlaveFD; struct termios tio; PID = fork(); if (PID == 0) { - char envstring[64]; char *argvec[4]; if (0 > setsid()) /* create us a new session for tty purposes */ diff --git a/src/vmemsave.c b/src/vmemsave.c index 83d1194..dc3d3c5 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -319,7 +319,9 @@ LispPTR vmem_save(char *sysout_file_name) register int i; char tempname[MAXPATHLEN]; register int rval; - DLword *bmptr; +#ifdef SUNDISPLAY + /* DLword *bmptr; */ +#endif #ifndef DOS extern int ScreenLocked; extern DLword *EmCursorX68K; diff --git a/src/xc.c b/src/xc.c index 66ed6d4..caa7438 100644 --- a/src/xc.c +++ b/src/xc.c @@ -234,7 +234,6 @@ void dispatch(void) { int fn_opcode_size; int fn_num_args; int fn_apply; - LispPTR fn_loc_defcell; RET; CLR_IRQ; @@ -1415,8 +1414,8 @@ check_interrupt: cause_interruptcall(DORECLAIM_index); } else if (*PENDINGINTERRUPT68k != NIL) { INTSTAT2 *intstate = ((INTSTAT2 *)Addr68k_from_LADDR(*INTERRUPTSTATE_word)); - unsigned char newints = (intstate->pendingmask) & ~(intstate->handledmask); - /* if (newints) */ + /*unsigned char newints = (intstate->pendingmask) & ~(intstate->handledmask); + if (newints) */ { intstate->handledmask |= intstate->pendingmask; *PENDINGINTERRUPT68k = NIL;