diff options
Diffstat (limited to 'Build/source/texk/seetexk')
-rw-r--r-- | Build/source/texk/seetexk/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/seetexk/dviconcat.c | 7 | ||||
-rw-r--r-- | Build/source/texk/seetexk/search.c | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog index c057addacb1..7e538f83cbb 100644 --- a/Build/source/texk/seetexk/ChangeLog +++ b/Build/source/texk/seetexk/ChangeLog @@ -1,3 +1,9 @@ +2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dviconcat.c: Replace bcmp() => memcmp(). + * search.c: Replace bcopy(f, t, l) => memcpy(t, f, l) and + bzero(s, l) => memset(s, 0, l). + 2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid use of deprecated INCLUDES. diff --git a/Build/source/texk/seetexk/dviconcat.c b/Build/source/texk/seetexk/dviconcat.c index fad8b536f9f..eb1bb828a69 100644 --- a/Build/source/texk/seetexk/dviconcat.c +++ b/Build/source/texk/seetexk/dviconcat.c @@ -102,11 +102,6 @@ i16 DVIStackSize; /* max of all stack sizes */ char writeerr[] = "error writing DVI file"; static void HandleDVIFile(void); -#ifdef _AMIGA -#define bcmp(s1, s2, len) memcmp(s1, s2, len) -#define bzero(s, len) memset(s, '\0', len) -#define index(s, c) strchr(s, c) -#endif /* _AMIGA */ #ifndef KPATHSEA char *malloc(), *realloc(); @@ -516,7 +511,7 @@ HandleFontDef(i32 index) if (fi->fi_designsize == designsize && fi->fi_mag == mag && fi->fi_n1 == n1 && fi->fi_n2 == n2 && - bcmp(fi->fi_name, s, i) == 0) { + memcmp(fi->fi_name, s, i) == 0) { if (fi->fi_checksum == 0) fi->fi_checksum = checksum; else if (checksum && fi->fi_checksum != checksum) { diff --git a/Build/source/texk/seetexk/search.c b/Build/source/texk/seetexk/search.c index c5b9ae6f245..c604b78b018 100644 --- a/Build/source/texk/seetexk/search.c +++ b/Build/source/texk/seetexk/search.c @@ -139,7 +139,7 @@ SSearch(struct search *s, i32 key, int *disp) return (0); } keyaddr = (keyaddr - s->s_data) + new; /* relocate */ - bcopy(s->s_data, new, s->s_n * s->s_dsize); + memcpy(new, s->s_data, s->s_n * s->s_dsize); free(s->s_data); s->s_data = new; s->s_space = s->s_n; @@ -164,8 +164,8 @@ SSearch(struct search *s, i32 key, int *disp) s->s_space--; *(i32 *) keyaddr = key; keyaddr += DOffset; /* now actually dataaddr */ - /* the bzero is just a frill... */ - bzero(keyaddr, s->s_dsize - DOffset); + /* the memset is just a frill... */ + memset(keyaddr, 0, s->s_dsize - DOffset); return (keyaddr); } |