From c9e52b65d40f396de02f658fd23ad259b7424b2b Mon Sep 17 00:00:00 2001 From: ceriel Date: Wed, 2 Sep 1987 18:42:21 +0000 Subject: [PATCH] some minor fixes, and one important 2/4 one in the sbreak function --- util/led/finish.c | 2 +- util/led/memory.c | 10 ++++------ util/led/scan.c | 11 ++++++----- util/led/write.c | 2 -- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/util/led/finish.c b/util/led/finish.c index cc0817698..64eed025e 100644 --- a/util/led/finish.c +++ b/util/led/finish.c @@ -188,7 +188,7 @@ put_locals(name, nnames) } iname++; } - wr_name(name, oname - name); + wr_name(name, (unsigned int) (oname - name)); } /* diff --git a/util/led/memory.c b/util/led/memory.c index cef8e5fbd..78af0db2a 100644 --- a/util/led/memory.c +++ b/util/led/memory.c @@ -46,7 +46,6 @@ static ind_t refused; sbreak(incr) ind_t incr; { - extern char *sbrk(); extern char *brk(); unsigned int inc; @@ -54,14 +53,14 @@ sbreak(incr) inc = incr; if ((refused && refused < incr) || - inc != incr || - BASE + inc < BASE || - (int) brk(BASE + inc) == -1) { + (sizeof(char *) < sizeof(long) && + (inc != incr || BASE + inc < BASE)) || + (int) brk(BASE + incr) == -1) { if (!refused || refused > incr) refused = incr; return -1; } - BASE += inc; + BASE += incr; return 0; } @@ -74,7 +73,6 @@ init_core() register char *base; register ind_t total_size; register struct memory *mem; - extern char *brk(); extern char *sbrk(); #include "mach.c" diff --git a/util/led/scan.c b/util/led/scan.c index 712afc2d5..55c9ac2cd 100644 --- a/util/led/scan.c +++ b/util/led/scan.c @@ -63,6 +63,7 @@ int getfile(filename) char *filename; { + unsigned int rd_unsigned2(); struct ar_hdr archive_header; ushort magic_number; #ifdef SYMDBUG @@ -515,7 +516,7 @@ modulsize(head) static struct outrelo *walkrelo; static unsigned short cnt_relos; -static unsigned short index; +static unsigned short relind; #define _RELSIZ 64 startrelo(head) @@ -528,7 +529,7 @@ startrelo(head) walkrelo = (struct outrelo *)address(ALLORELO, reloindex); } else { - index = _RELSIZ; + relind = _RELSIZ; rd_rew_relos(head); cnt_relos = head->oh_nrelo; } @@ -542,14 +543,14 @@ nextrelo() if (incore) return walkrelo++; - if (index == _RELSIZ) { + if (relind == _RELSIZ) { int i = cnt_relos >= _RELSIZ ? _RELSIZ : cnt_relos; cnt_relos -= i; rd_relo(relobuf, i); - index = 0; + relind = 0; } - return &relobuf[index++]; + return &relobuf[relind++]; } /* ------------------------------------------------------------------------- */ diff --git a/util/led/write.c b/util/led/write.c index 39389f63d..08ae54938 100644 --- a/util/led/write.c +++ b/util/led/write.c @@ -61,7 +61,6 @@ sectname(sectindex) */ end_write() { - register ushort cnt; register struct outname *name; register int sectindex; extern ushort NGlobals; @@ -69,7 +68,6 @@ end_write() assert(!incore); assert(!(flagword & SFLAG)); - cnt = NGlobals; name = (struct outname *)address(ALLOGLOB, (ind_t)0); namecpy(name, NGlobals, off_char); wr_name(name, NGlobals); -- 2.34.1