From 30e0f9c39978e52aefbcc54ef69efb439ea20ff5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 27 Mar 2000 06:37:56 +0000 Subject: [PATCH] Update. * locale/programs/localedef.c (construct_output_path): If path contains a / compute the end of the directory name correctly. --- ChangeLog | 3 +++ locale/programs/localedef.c | 2 +- malloc/mcheck.c | 6 ++++++ malloc/mcheck.h | 3 --- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70d4a9d8ea..7766f10159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-03-26 Ulrich Drepper + * locale/programs/localedef.c (construct_output_path): If path + contains a / compute the end of the directory name correctly. + * include/features.h: Undef and document __USE_XOPEN2K. * malloc/mcheck.c: Implement pedantic checking of all allocated blocks diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 9def7a38ad..e129c0c241 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -367,7 +367,7 @@ construct_output_path (char *path) memory allocation. */ size_t len = strlen (path) + 1; result = xmalloc (len + 1); - endp = mempcpy (result, path, len); + endp = mempcpy (result, path, len) - 1; } errno = 0; diff --git a/malloc/mcheck.c b/malloc/mcheck.c index 42e8e71174..0d32fc17f7 100644 --- a/malloc/mcheck.c +++ b/malloc/mcheck.c @@ -111,12 +111,18 @@ check_all () with. */ struct hdr *runp = root; + /* Temporarily turn off the checks. */ + pedantic = 0; + while (runp != NULL) { (void) checkhdr (runp); runp = runp->next; } + + /* Turn checks on again. */ + pedantic = 1; } static void unlink_blk __P ((struct hdr *ptr)); diff --git a/malloc/mcheck.h b/malloc/mcheck.h index 9460547d08..2b8bbb2cbf 100644 --- a/malloc/mcheck.h +++ b/malloc/mcheck.h @@ -45,9 +45,6 @@ extern int mcheck (void (*__abortfunc) (enum mcheck_status)) __THROW; the memory handling functions is called. This can be very slow. */ extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) __THROW; -/* Similar to `mcheck', but perform tests on all blocks every time. */ -extern int mcheck_verbose (void (*func) __P ((enum mcheck_status))); - /* Check for aberrations in a particular malloc'd block. You must have called `mcheck' already. These are the same checks that `mcheck' does when you free or reallocate a block. */