From 64957b508d2c6d946dbf2f6a784c922db952e907 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sun, 14 Feb 2021 00:14:12 +0700 Subject: [PATCH] Fix some unused variable warnings. (#352) Also removes a prototype that wasn't needed. --- src/dsk.c | 9 +++++++-- src/ldsout.c | 12 ++++-------- src/llstk.c | 9 ++------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/dsk.c b/src/dsk.c index 1b1f89e..9d8960a 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -2250,8 +2250,8 @@ LispPTR COM_getfreeblock(register LispPTR *args) register int dskp, rval, *buf; char lfname[MAXPATHLEN + 5], dir[MAXPATHLEN], host[MAXNAMLEN]; char name[MAXNAMLEN + 1], file[MAXPATHLEN], ver[VERSIONLEN]; - char drive[2]; #ifdef DOS + char drive[2]; struct diskfree_t sfsbuf; #else struct statvfs sfsbuf; @@ -2501,7 +2501,10 @@ int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp) int true_name(register char *path) { char dir[MAXPATHLEN]; - char name[MAXNAMLEN], drive[1]; + char name[MAXNAMLEN]; +#ifdef DOS + char drive[1]; +#endif register char *sp, *cp; register int type, c; @@ -3056,8 +3059,10 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr register FileName *svarray; register DIR *dirp; register struct dirent *dp; + /* Used in commented out code below: register int rval; struct stat sbuf; + */ /* * First of all, prepare a lower cased file name for the case insensitive diff --git a/src/ldsout.c b/src/ldsout.c index 58eac7d..27e3bb9 100644 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -52,7 +52,6 @@ int Storage_expanded; /* T or NIL */ /************************************************************************/ #if defined(DOS) || defined(XWINDOW) #include "devif.h" -static char *metersyms = "-\\|/"; extern DspInterface currentdsp; #endif /* DOS || XWINDOW */ @@ -75,12 +74,10 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { unsigned sysout_size; /* sysout size in page */ struct stat stat_buf; /* file stat buf */ - int i, vp; + int i; char errmsg[255]; - int j = 0; - /* Checks for specifying the process size (phase I) */ /* If sys_size == 0 figure out the proper size later */ if ((sys_size != 0) && (sys_size < DEFAULT_PRIME_SYSOUTSIZE)) { @@ -300,7 +297,7 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { } _settextposition((short)0, (short)0); if ((i & 0xf) == 0) { - for (j = 0; j < (columns * i) / (sysout_size >> 1); j++) putchar(' '); + for (int j = 0; j < (columns * i) / (sysout_size >> 1); j++) putchar(' '); printf("-=(%2d%%)=-\n", (100 * i) / (sysout_size >> 1)); } #endif /* DOS */ @@ -316,9 +313,8 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { printf(" offset was 0x%lx (0x%x pages).\n", lispworld_offset, GETFPTOVP(fptovp, i)); perror("read() error was"); - { - int j; - for (j = 0; j < 10; j++) printf(" %d: 0x%x ", j, GETFPTOVP(fptovp, j)); + for (int j = 0; j < 10; j++) { + printf(" %d: 0x%x ", j, GETFPTOVP(fptovp, j)); } free(fptovp); exit(-1); diff --git a/src/llstk.c b/src/llstk.c index 947432f..6e2296c 100644 --- a/src/llstk.c +++ b/src/llstk.c @@ -215,12 +215,10 @@ out: */ /******************************************************************/ int do_stackoverflow(int incallp) { - register DLword *next68k; DLword newfx; DLword savenext; DLword *oldPVar; int movedistance; - LispPTR moveframe(register FX * oldfx68k); #ifdef STACKCHECK LispPTR stackcontents; LispPTR TopIVAR; @@ -431,7 +429,7 @@ void decusecount68k(register FX *frame68k) { DLword *alink68k; register Bframe *blink68k; DLword *clink68k; - register DLword *ivar68k; + /*** register DLword *ivar68k; */ register int size; if (FX_INVALIDP(frame68k)) return; @@ -1038,14 +1036,11 @@ void check_BF(Bframe *bf68k) { /************************************************************************/ int check_stack_rooms(FX *fx68k) { - int size; - DLword *freeptr68k, *endstk68k; + DLword *freeptr68k; CHECK_FX(fx68k); freeptr68k = Addr68k_from_StkOffset(fx68k->nextblock); if (!FSBP(freeptr68k)) error("check_stack_rooms: nextblock doesn't point to an FSB"); - /*endstk68k=freeptr68k + FSB_size(freeptr68k); - size=((UNSIGNED)endstk68k - (UNSIGNED)CurrentStackPTR) >> 1;*/ return (FSB_size(freeptr68k)); } /* end check_stack_rooms */