diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 12:36:37 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-01-05 12:36:37 +0200 |
| commit | e10e807ce9b6f252450404e57093aeaa023150a5 (patch) | |
| tree | 82a09ea1fdaea45734289340027e8c4cb8ef2c49 | |
| parent | 2c6120755c44dc68605e33f6f84aa9896af55d28 (diff) | |
| download | librpm-tizen-e10e807ce9b6f252450404e57093aeaa023150a5.tar.gz librpm-tizen-e10e807ce9b6f252450404e57093aeaa023150a5.tar.bz2 librpm-tizen-e10e807ce9b6f252450404e57093aeaa023150a5.zip | |
Move <mcheck.h> include out of system.h to the couple of places that care
- only two real users inside rpm
- remove mcheck foo from rpminject and rpmsort, we're not interested...
| -rw-r--r-- | lib/poptALL.c | 4 | ||||
| -rw-r--r-- | rpmqv.c | 3 | ||||
| -rw-r--r-- | system.h | 4 | ||||
| -rw-r--r-- | tools/rpminject.c | 4 | ||||
| -rw-r--r-- | tools/rpmsort.c | 3 |
5 files changed, 7 insertions, 11 deletions
diff --git a/lib/poptALL.c b/lib/poptALL.c index 50dfd5c17..0a49d4082 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -6,6 +6,10 @@ #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/rpmgi.h> @@ -12,6 +12,9 @@ const char *__progname; #endif #include <sys/wait.h> +#if HAVE_MCHECK_H +#include <mcheck.h> +#endif #include <rpm/rpmcli.h> #include <rpm/rpmlib.h> /* RPMSIGTAG, rpmReadPackageFile .. */ @@ -143,10 +143,6 @@ typedef char * security_context_t; typedef void * cap_t; #endif -#if HAVE_MCHECK_H -#include <mcheck.h> -#endif /* HAVE_MCHECK_H */ - #include "rpmio/rpmutil.h" /* compatibility macros to avoid a mass-renaming all over the codebase */ #define xmalloc(_size) rmalloc((_size)) diff --git a/tools/rpminject.c b/tools/rpminject.c index 903709819..6d4316cd5 100644 --- a/tools/rpminject.c +++ b/tools/rpminject.c @@ -455,10 +455,6 @@ main(int argc, char *argv[]) int ec = 0; injmode_t lastmode = INJ_UNKNOWN; -#if HAVE_MCHECK_H && HAVE_MTRACE - mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ -#endif - setprogname(argv[0]); /* Retrofit glibc __progname */ #if defined(ENABLE_NLS) (void)setlocale(LC_ALL, "" ); diff --git a/tools/rpmsort.c b/tools/rpmsort.c index 2a14b91d2..3d93b7604 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -252,9 +252,6 @@ main(int argc, char *argv[]) }; -#if HAVE_MCHECK_H && HAVE_MTRACE - mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */ -#endif setprogname(argv[0]); /* Retrofit glibc __progname */ #if defined(ENABLE_NLS) (void)setlocale(LC_ALL, "" ); |