diff options
| author | Charles.Forsyth <devnull@localhost> | 2008-06-26 16:29:26 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2008-06-26 16:29:26 +0000 |
| commit | 4256b754997ba49aec62efd600003cb84f453c8a (patch) | |
| tree | 73453793320ef6b3f7880ed27a05637476acaa06 | |
| parent | 457abe954bd0d9aac97eef208e6fd3316d189afe (diff) | |
20080626-1728
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | utils/libmach/sym.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/version.h b/include/version.h index ad8b40f4..2f046381 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20080623)" +#define VERSION "Fourth Edition (20080626)" diff --git a/utils/libmach/sym.c b/utils/libmach/sym.c index 6b62c555..d9ffe63f 100644 --- a/utils/libmach/sym.c +++ b/utils/libmach/sym.c @@ -43,7 +43,7 @@ static int debug = 0; static Sym **autos; /* Base of auto variables */ static File *files; /* Base of file arena */ -static int fmax; /* largest file path index */ +static int fmaxp; /* largest file path index */ static Sym **fnames; /* file names path component table */ static Sym **globals; /* globals by addr table */ static Hist *hist; /* base of history stack */ @@ -144,8 +144,8 @@ syminit(int fd, Fhdr *fp) p->type = 'm'; nauto++; } - else if(p->value > fmax) - fmax = p->value; /* highest path index */ + else if(p->value > fmaxp) + fmaxp = p->value; /* highest path index */ break; case 'a': case 'p': @@ -164,7 +164,7 @@ syminit(int fd, Fhdr *fp) } } if (debug) - fprint(2,"NG: %ld NT: %ld NF: %d\n", nglob, ntxt, fmax); + fprint(2,"NG: %ld NT: %ld NF: %d\n", nglob, ntxt, fmaxp); if (fp->sppcsz) { /* pc-sp offset table */ spoff = (uchar *)malloc(fp->sppcsz); if(spoff == 0) { @@ -285,7 +285,7 @@ cleansyms(void) if(fnames) free(fnames); fnames = 0; - fmax = 0; + fmaxp = 0; if(files) free(files); @@ -373,13 +373,13 @@ buildtbls(void) return 0; } } - fmax++; - fnames = malloc(fmax*sizeof(*fnames)); + fmaxp++; + fnames = malloc(fmaxp*sizeof(*fnames)); if (!fnames) { werrstr("can't malloc file name table"); return 0; } - memset(fnames, 0, fmax*sizeof(*fnames)); + memset(fnames, 0, fmaxp*sizeof(*fnames)); files = malloc(nfiles*sizeof(*files)); if(!files) { werrstr("can't malloc file table"); @@ -858,7 +858,7 @@ pathcomp(char *s, int n) { int i; - for(i = 0; i <= fmax; i++) + for(i = 0; i <= fmaxp; i++) if(fnames[i] && strncmp(s, fnames[i]->name, n) == 0 && fnames[i]->name[n] == 0) return i; return -1; |