github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-17 16:44:00 +00:00
Code Issues Projects Releases Wiki Activity

Don't use "id" for a variable shadowing the global "id" identification string.

Browse Source 
modified:   src/chatter.c
	modified:   src/dir.c
	modified:   src/ejlisp.c
	modified:   src/osmsg.c
	modified:   src/picture.c
This commit is contained in:
Nick Briggs 2020-11-28 18:16:59 -08:00
parent fea01d8b69
commit 90cca21044
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chatter.c
View File

@ -65,21 +65,21 @@ int chatter_fd;
OneDArray *arrayp; \
char *base; \
short *sbase; \
int id; \
int idx; \
\
arrayp = (OneDArray *)(Addr68k_from_LADDR((UNSIGNED)Lisp)); \
\
switch (arrayp->typenumber) { \
case THIN_CHAR_TYPENUMBER: \
base = ((char *)(Addr68k_from_LADDR((UNSIGNED)arrayp->base))) + ((int)(arrayp->offset)); \
for (id = 0; id < Len; id++) base[id] = C[id]; \
for (idx = 0; idx < Len; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\
case FAT_CHAR_TYPENUMBER: \
sbase = ((short *)(Addr68k_from_LADDR((UNSIGNED)arrayp->base))) + ((int)(arrayp->offset)); \
base = (char *)sbase; \
for (id = 0; id < Len * 2; id++) base[id] = C[id]; \
for (idx = 0; idx < Len * 2; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\

10
src/dir.c
View File

@ -2070,7 +2070,7 @@ LispPTR COM_gen_files(register LispPTR *args)
{
char fbuf[MAXPATHLEN + 5], dir[MAXPATHLEN], pattern[MAXPATHLEN];
char host[MAXNAMLEN], name[MAXNAMLEN], ver[VERSIONLEN], drive[1];
int dskp, count, highestp, propp, id, version;
int dskp, count, highestp, propp, fid, version;
register char *cp;
FINFO *fp;
int dsk_filecmp(), unix_filecmp();
@ -2197,10 +2197,10 @@ LispPTR COM_gen_files(register LispPTR *args)
count = trim_finfo(&fp);
}
if ((id = get_finfo_id()) < 0) return (GetSmallp(-1));
*(int *)(Addr68k_from_LADDR(args[2])) = id;
FinfoArray[id].head = fp;
FinfoArray[id].next = fp;
if ((fid = get_finfo_id()) < 0) return (GetSmallp(-1));
*(int *)(Addr68k_from_LADDR(args[2])) = fid;
FinfoArray[fid].head = fp;
FinfoArray[fid].next = fp;
return (GetSmallp(count));
}
}

6
src/ejlisp.c
View File

@ -72,7 +72,7 @@ static char *id = "$Id: ejlisp.c,v 1.2 1999/01/03 02:06:58 sybalsky Exp $ Copyri
OneDArray *arrayp; \
char *base; \
short *sbase; \
int id; \
int idx; \
\
arrayp = (OneDArray *)(Addr68k_from_LADDR((unsigned int)Lisp)); \
\
@ -80,7 +80,7 @@ static char *id = "$Id: ejlisp.c,v 1.2 1999/01/03 02:06:58 sybalsky Exp $ Copyri
case THIN_CHAR_TYPENUMBER: \
base = \
((char *)(Addr68k_from_LADDR((unsigned int)arrayp->base))) + ((int)(arrayp->offset)); \
for (id = 0; id < Len; id++) base[id] = C[id]; \
for (idx = 0; idx < Len; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\
@ -88,7 +88,7 @@ static char *id = "$Id: ejlisp.c,v 1.2 1999/01/03 02:06:58 sybalsky Exp $ Copyri
sbase = \
((short *)(Addr68k_from_LADDR((unsigned int)arrayp->base))) + ((int)(arrayp->offset)); \
base = (char *)sbase; \
for (id = 0; id < Len * 2; id++) base[id] = C[id]; \
for (idx = 0; idx < Len * 2; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\

4
src/osmsg.c
View File

@ -96,7 +96,6 @@ extern u_int LispReadFds;
void mess_init() {
#ifndef XWINDOW
#ifndef DOS
int id;
struct passwd *pwd;
int ttyfd;
int ptyfd, ptynum;
@ -224,7 +223,6 @@ static struct timeval selecttimeout = {0, 0};
LispPTR mess_readp() {
#ifndef DOS
#ifndef XWINDOW
int id;
struct stat sbuf;
int size;
int rval;
@ -269,7 +267,6 @@ LispPTR mess_read(LispPTR *args)
#if defined(DOS) || defined(XWINDOW)
return (NIL);
#else
int id;
struct stat sbuf;
int size, save_size;
char *base;
@ -344,7 +341,6 @@ LispPTR flush_pty() {
#if defined(DOS) || defined(XWINDOW)
return (NIL);
#else
int id;
struct stat sbuf;
char buf[MESSAGE_BUFFER_SIZE]; /* Buffer between pty and log file */
int size;

6
src/picture.c
View File

@ -67,7 +67,7 @@ static char *id = "$Id: picture.c,v 1.2 1999/01/03 02:07:30 sybalsky Exp $ Copyr
OneDArray *arrayp; \
char *base; \
short *sbase; \
int id; \
int idx; \
\
arrayp = (OneDArray *)(Addr68k_from_LADDR((unsigned int)Lisp)); \
\
@ -75,7 +75,7 @@ static char *id = "$Id: picture.c,v 1.2 1999/01/03 02:07:30 sybalsky Exp $ Copyr
case THIN_CHAR_TYPENUMBER: \
base = \
((char *)(Addr68k_from_LADDR((unsigned int)arrayp->base))) + ((int)(arrayp->offset)); \
for (id = 0; id < Len; id++) base[id] = C[id]; \
for (idx = 0; idx < Len; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\
@ -83,7 +83,7 @@ static char *id = "$Id: picture.c,v 1.2 1999/01/03 02:07:30 sybalsky Exp $ Copyr
sbase = \
((short *)(Addr68k_from_LADDR((unsigned int)arrayp->base))) + ((int)(arrayp->offset)); \
base = (char *)sbase; \
for (id = 0; id < Len * 2; id++) base[id] = C[id]; \
for (idx = 0; idx < Len * 2; idx++) base[idx] = C[idx]; \
arrayp->fillpointer = Len; \
break; \
\