diff options
| author | Jindrich Novy <jnovy@redhat.com> | 2011-03-23 12:37:25 +0100 |
|---|---|---|
| committer | Jindrich Novy <jnovy@redhat.com> | 2011-03-23 12:37:25 +0100 |
| commit | b03685d320ce3484ee4163ebc3c04e8f84acc6fa (patch) | |
| tree | b21f08a3729c41b7c6c29c2ff9a6357c6b7774dd | |
| parent | 3ab3a931b4dd84eedcb35229187e5be8d14f9418 (diff) | |
| download | rpm-b03685d320ce3484ee4163ebc3c04e8f84acc6fa.tar.gz rpm-b03685d320ce3484ee4163ebc3c04e8f84acc6fa.tar.bz2 rpm-b03685d320ce3484ee4163ebc3c04e8f84acc6fa.zip | |
Don't use mtrace(3), muntrace(3) and don't check for mcheck.h
- valgrind is good for these things without touching the code
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/poptALL.c | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 8fa79342f..58a5c8550 100644 --- a/configure.ac +++ b/configure.ac @@ -354,7 +354,6 @@ AC_CHECK_HEADERS(sys/utsname.h) AC_CHECK_HEADERS(sys/systemcfg.h) AC_CHECK_HEADERS(sys/param.h) -AC_CHECK_HEADERS(mcheck.h) AC_CHECK_HEADERS(glob.h) @@ -488,7 +487,6 @@ AC_TYPE_SIZE_T dnl Checks for library functions. AC_FUNC_MMAP -AC_CHECK_FUNCS(mtrace) AC_CHECK_FUNCS(putenv) AC_REPLACE_FUNCS(stpcpy stpncpy) diff --git a/lib/poptALL.c b/lib/poptALL.c index 30c29d6e3..8510d90d6 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -6,10 +6,6 @@ #include "system.h" const char *__progname; -#if HAVE_MCHECK_H -#include <mcheck.h> -#endif - #include <rpm/rpmcli.h> #include <rpm/rpmlib.h> /* rpmEVR, rpmReadConfigFiles etc */ #include <rpm/rpmlog.h> @@ -227,10 +223,6 @@ rpmcliFini(poptContext optCon) rpmFreeRpmrc(); rpmlogClose(); -#if HAVE_MCHECK_H && HAVE_MTRACE - muntrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ -#endif - return NULL; } @@ -241,9 +233,6 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) int rc; const char *ctx, *execPath; -#if HAVE_MCHECK_H && HAVE_MTRACE - mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ -#endif setprogname(argv[0]); /* Retrofit glibc __progname */ /* XXX glibc churn sanity */ |