diff --git a/src/chardev.c b/src/chardev.c index 12ec448..1860855 100644 --- a/src/chardev.c +++ b/src/chardev.c @@ -78,7 +78,7 @@ LispPTR CHAR_openfile(LispPTR *args) #ifndef DOS register int fd; /* return value of open system call. */ register int flags; /* open system call's argument */ - struct stat statbuf; + /* struct stat statbuf; */ char pathname[MAXPATHLEN]; Lisp_errno = (int *)(Addr68k_from_LADDR(args[2])); diff --git a/src/dlpi.c b/src/dlpi.c index 4387538..09499c2 100644 --- a/src/dlpi.c +++ b/src/dlpi.c @@ -1,8 +1,4 @@ /* $Id: dlpi.c,v 1.3 2001/12/24 01:09:00 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ -#ifndef lint -static char *RCSid = - "$Header: /disk/disk3/cvsroot/medley/src/dlpi.c,v 1.3 2001/12/24 01:09:00 sybalsky Exp $"; -#endif #include "os.h" diff --git a/src/gcarray.c b/src/gcarray.c index 1eeb9cf..376e574 100644 --- a/src/gcarray.c +++ b/src/gcarray.c @@ -257,7 +257,7 @@ LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword int externalp) { int packindex; PACKAGE *packaddr; - LispPTR hashtbladdr; + /* LispPTR hashtbladdr; */ LispPTR index; /* For convenience, recognize the common package nicknames: */ diff --git a/src/initdsp.c b/src/initdsp.c index de0e39c..8aa09e7 100644 --- a/src/initdsp.c +++ b/src/initdsp.c @@ -279,11 +279,11 @@ void clear_display() { void init_display2(DLword *display_addr, int display_max) { - int mmapstat; - int fbgattr_result; - char *texture_base; - #ifdef SUNDISPLAY +#ifndef DISPLAYBUFFER + int mmapstat; +#endif + int fbgattr_result; struct fbtype my_screen; char groups[PIXPG_OVERLAY + 1]; struct fbgattr FBattr; @@ -724,8 +724,7 @@ void flush_display_region(int x, int y, int w, int h) void byte_swapped_displayregion(int x, int y, int w, int h) { extern unsigned char reversedbits[]; - register unsigned int *longptr, *lineptr; - register int linecount, wordlimit; + register unsigned int *longptr; /* Get QUAD byte aligned pointer */ longptr = (unsigned int *)(((UNSIGNED)((DLword *)DisplayRegion68k + (DLWORD_PERLINE * y)) + @@ -808,7 +807,7 @@ void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSI { flush_display_buffer(); } #else { - int y, x, baseoffset, realw; + int y, x, baseoffset; baseoffset = (((DLword *)ybase) - DisplayRegion68k); y = baseoffset / DLWORD_PERLINE; x = bitoffset + (BITSPERWORD * (baseoffset - (DLWORD_PERLINE * y))); diff --git a/src/initkbd.c b/src/initkbd.c index 517af78..1365fc0 100644 --- a/src/initkbd.c +++ b/src/initkbd.c @@ -260,7 +260,9 @@ u_char DOSLispKeyMap_101[0x80] = { void init_keyboard(int flg) /* if 0 init else re-init */ { +#ifdef SUNDISPLAY int keytrans; +#endif set_kbd_iopointers(); @@ -450,7 +452,6 @@ static u_char *make_X_keymap() { int *key_sym_pairs = generic_X_keymap; int i = 0; KeySym *mapping; - KeyCode first; int codecount, symspercode, minkey, maxkey; for (; i < 256; i++) { /* clear the tables we just allocated */ diff --git a/src/kbdsubrs.c b/src/kbdsubrs.c index 66edc4c..c8181ee 100644 --- a/src/kbdsubrs.c +++ b/src/kbdsubrs.c @@ -123,9 +123,9 @@ void KB_beep(LispPTR *args) /* args[0] : ON/OFF flag * args[1] : frequency */ { +#ifdef SUNDISPLAY int keycommand; -#ifdef SUNDISPLAY /* belltime.tv_usec = args[1] & 0xffff; win_bell(LispWindowFd, belltime, 0); */ diff --git a/src/keyevent.c b/src/keyevent.c index 7b9e02f..2e72609 100644 --- a/src/keyevent.c +++ b/src/keyevent.c @@ -137,7 +137,6 @@ static struct timeval SelectTimeout = {0, 0}; #endif /* DOS */ #ifdef XWINDOW -static int Xcount = 1; extern int Event_Req; #endif /* XWINDOW */ @@ -647,7 +646,6 @@ void taking_mouse_down() { void copy_cursor(int newx, int newy) { register DLword *srcbase, *dstbase; - register int offsetx, offsety; static int sx, dx, w, h, srcbpl, dstbpl, backwardflg = 0; static int src_comp = 0, op = 0, gray = 0, num_gray = 0, curr_gray_line = 0; extern DLword *EmCursorBitMap68K; diff --git a/src/keymaker.c b/src/keymaker.c index 07e4690..b5191ab 100644 --- a/src/keymaker.c +++ b/src/keymaker.c @@ -1,6 +1,5 @@ /* $Id: keymaker.c,v 1.3 1999/05/31 23:35:35 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ -static const char *id = "$Id: keymaker.c,v 1.3 1999/05/31 23:35:35 sybalsky Exp $ Copyright (C) Venue"; /************************************************************************/ /* */ diff --git a/src/loopsops.c b/src/loopsops.c index 3e99393..d3ad899 100644 --- a/src/loopsops.c +++ b/src/loopsops.c @@ -350,7 +350,6 @@ LispPTR lcfuncall(register unsigned int atom_index, register int argnum, registe register short pv_num; /* scratch for pv */ register struct fnhead *tmp_fn; int rest; /* use for arignments */ - register CClosure *closure68k; if (atom_index == 0xffffffff) error("Loops punt to nonexistent fn"); diff --git a/src/miscn.c b/src/miscn.c index 615d7b8..f17c59b 100644 --- a/src/miscn.c +++ b/src/miscn.c @@ -67,7 +67,7 @@ int OP_miscn(int misc_index, int arg_count) { switch (misc_index) { case miscn_USER_SUBR: { - register LispPTR user_subr, user_args; + register LispPTR user_subr; N_GETNUMBER(args[0], user_subr, do_ufn); if ((result = UserSubr(user_subr, arg_count - 1, &args[1])) < 0) goto do_ufn; } break; diff --git a/src/osmsg.c b/src/osmsg.c index d460683..e4381d8 100644 --- a/src/osmsg.c +++ b/src/osmsg.c @@ -201,9 +201,6 @@ void mess_reset() { /* has been set by flush_pty(). */ /* */ /************************************************************************/ -#ifndef DOS -static struct timeval selecttimeout = {0, 0}; -#endif LispPTR mess_readp() { #ifndef DOS #ifndef XWINDOW @@ -330,6 +327,9 @@ LispPTR flush_pty() { static fd_set rfds; int rval; struct statvfs vfsbuf; +#ifndef LOGINT + struct timeval selecttimeout = {0, 0}; +#endif SETJMP(NIL); DBPRINT(("flush_pty() called.\n")); diff --git a/src/rpc.c b/src/rpc.c index 04ea835..7123647 100644 --- a/src/rpc.c +++ b/src/rpc.c @@ -60,7 +60,6 @@ LispPTR rpc(LispPTR *args) */ char hostname[MAX_HOSTNAME_LENGTH]; struct hostent *hp; - struct servent *sp; struct sockaddr_in sin, sin1, from; char *outbuf, *inbuf, *destaddr; register int s, msec_until_timeout, msec_between_tries, out_length; diff --git a/src/rplcons.c b/src/rplcons.c index f836c53..2d289a3 100644 --- a/src/rplcons.c +++ b/src/rplcons.c @@ -38,8 +38,11 @@ /***************************************************/ LispPTR N_OP_rplcons(register LispPTR list, register LispPTR item) { +#ifndef NEWCDRCODING register struct conspage *conspage; - register ConsCell *new_cell, *list68k; + register ConsCell *new_cell; +#endif + register ConsCell *list68k; LispPTR register page; diff --git a/src/setsout.c b/src/setsout.c index bc44c3f..d0d5521 100644 --- a/src/setsout.c +++ b/src/setsout.c @@ -93,7 +93,7 @@ void set_sysout(int version, char *sysout_file_name) { } int main(int argc, char **argv) { - int version, res; + int version; if (argc < 3) { printf("setsysout version sysout-name\n"); return (-1); diff --git a/src/storage.c b/src/storage.c index 63001ec..1e428b8 100644 --- a/src/storage.c +++ b/src/storage.c @@ -1,7 +1,5 @@ /* $Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ -static const char *id = - "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyright (C) Venue"; /************************************************************************/ /* */ diff --git a/src/subr.c b/src/subr.c index 821d93b..d7695c0 100644 --- a/src/subr.c +++ b/src/subr.c @@ -105,7 +105,6 @@ char *atom_to_str(LispPTR atom_index) { void OP_subrcall(int subr_no, int argnum) { static LispPTR args[30]; int arg_num; - int i; PushCStack; /* save TOS in memory */ diff --git a/src/ufs.c b/src/ufs.c index d47d68f..6d23147 100644 --- a/src/ufs.c +++ b/src/ufs.c @@ -453,7 +453,7 @@ int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int int unixpathname(char *src, char *dst, int versionp, int genp) #endif /* DOS */ { - register char *cp, *dp, *np, *rp; + register char *cp, *dp, *np; register int newdirflg; char name[64]; char lfname[MAXPATHLEN], fbuf1[MAXPATHLEN], fbuf2[MAXPATHLEN]; @@ -461,6 +461,7 @@ int unixpathname(char *src, char *dst, int versionp, int genp) struct passwd *pwd; #ifdef DOS + char *rp; int namelen = 0, extlen = 0; /* lengths of name & extension */ int extensionp = 0; /* T if we're in the extension */ int version = 1; /* version # for this file */ @@ -858,7 +859,7 @@ int unixpathname(char *src, char *dst, int versionp, int genp) int lisppathname(char *fullname, char *lispname, int dirp, int versionp) { register char *cp, *dp, *lnamep, *cnamep; - char namebuf[MAXPATHLEN], fbuf[MAXPATHLEN], ver[VERSIONLEN], drive; + char namebuf[MAXPATHLEN], fbuf[MAXPATHLEN], ver[VERSIONLEN]; register int i, mask, extensionp; if (strcmp(fullname, DIRSEPSTR) == 0) { diff --git a/src/uraid.c b/src/uraid.c index c11a923..1fb7266 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -286,7 +286,6 @@ extern int PrintMaxLevel; /* for print level */ LispPTR parse_atomstring(char *string) { char *start, *packageptr, *nameptr; - int flag = 0; int packagelen = 0; int namelen = 0; int cnt; @@ -371,7 +370,7 @@ unsigned int uGetTN(unsigned int address) { /***********************************************************************/ LispPTR uraid_commands() { - int num, address, val, tmp; + int num, address, val; LispPTR index; DefCell *defcell68k; #ifndef DOS @@ -869,12 +868,9 @@ extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect; #endif /* SUNDISPLAY */ int device_before_raid() { - int keytrans; - int size; - int munmapstat; - struct pixrect *fb; - /* extern char *alloc_hideDISP(); */ #ifdef SUNDISPLAY + int size; + int keytrans; union wait status; #endif /* SUNDISPLAY */ @@ -1147,13 +1143,12 @@ int device_after_raid() { static int re_init_display(int lisp_display_addr, int display_max) { +#ifdef SUNDISPLAY int mmapstat, size; struct pixrect *ColorFb; extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect; extern int DisplayType; -#ifdef SUNDISPLAY - union wait status; if (Win_security_p) { @@ -1257,15 +1252,11 @@ static int re_init_display(int lisp_display_addr, int display_max) static int re_init_display(int lisp_display_addr, int display_max) { +#ifdef SUNDISPLAY int mmapstat, size; struct pixrect *ColorFb; - /* - extern struct pixrect *color_source; - */ struct pixrect *color_source; extern int DisplayType; - -#ifdef SUNDISPLAY union wait status; if (Win_security_p) { diff --git a/src/uutils.c b/src/uutils.c index 371ff0a..119d440 100644 --- a/src/uutils.c +++ b/src/uutils.c @@ -139,7 +139,6 @@ int c_string_to_lisp_string(char *C, LispPTR Lisp) { LispPTR check_unix_password(LispPTR *args) { #ifndef DOS struct passwd *pwd; - char *password; #ifndef OS5 char *crypt(const char *, const char *); #endif /* OS5 */ diff --git a/src/vmemsave.c b/src/vmemsave.c index b5f2b09..83d1194 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -318,7 +318,6 @@ LispPTR vmem_save(char *sysout_file_name) int vmemsize; /* VMEMSIZE */ register int i; char tempname[MAXPATHLEN]; - char *cp; register int rval; DLword *bmptr; #ifndef DOS @@ -415,7 +414,9 @@ LispPTR vmem_save(char *sysout_file_name) for (i = 0; i < vmemsize; i++) { if (GETPAGEOK(fptovp, i) != 0177777) { int oldfptovp = GETFPTOVP(fptovp, i); +#ifdef DEBUG int saveoldfptovp = oldfptovp; +#endif int contig_pages = 0; register char *base_addr; diff --git a/src/xwinman.c b/src/xwinman.c index b429b08..5f7056a 100644 --- a/src/xwinman.c +++ b/src/xwinman.c @@ -64,7 +64,6 @@ int bound(int a, int b, int c) void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int grav) { - XSetWindowAttributes Lisp_SetWinAttributes; Window OldWindow; /* Change Background Pixmap of Gravity Window */