From b7e4726f3f1c7c1ab33b04e944294e5858c37fff Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 20 Jun 2011 11:21:36 +0100 Subject: [PATCH 03/14] Remove unused support for "verbose mode" --- configure.ac | 12 ------------ test/core/test-profile.c | 6 +----- 2 files changed, 1 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index fbda99e..6dfed0d 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,6 @@ AC_HEADER_STDC AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE) AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) -AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE) AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes) AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no) @@ -63,10 +62,6 @@ if test x$enable_bash_completion = xyes; then AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) fi -if test x$enable_verbose_mode = xyes; then - AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) -fi - AC_ARG_WITH(dbus-binding-tool, AS_HELP_STRING([--with-dbus-binding-tool=[filename]],[Use external dbus-binding-tool program]), [DBUS_BINDING_TOOL=$withval],[DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool]) @@ -80,9 +75,6 @@ if test x$enable_tests = xyes; then AC_DEFINE(DBUS_BUILD_TESTS,1,[Build test code]) fi -if test x$enable_verbose_mode = xyes; then - AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) -fi if test x$enable_asserts = xno; then AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking]) AC_DEFINE(G_DISABLE_ASSERT,1,[Disable GLib assertion macros]) @@ -402,7 +394,6 @@ echo " Maintainer mode: ${USE_MAINTAINER_MODE} gcc coverage profiling: ${enable_gcov} Building unit tests: ${enable_tests} - Building verbose mode: ${enable_verbose_mode} Building assertions: ${enable_asserts} Building checks: ${enable_checks} Building Gtk-doc docs: ${enable_gtk_doc} @@ -420,9 +411,6 @@ fi if test x$enable_gcov = xyes; then echo "NOTE: building with coverage profiling is definitely for developers only." fi -if test x$enable_verbose_mode = xyes; then - echo "NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance." -fi if test x$enable_asserts = xyes; then echo "NOTE: building with assertions increases library size and decreases performance." fi diff --git a/test/core/test-profile.c b/test/core/test-profile.c index 10baa0b..8ad3e22 100644 --- a/test/core/test-profile.c +++ b/test/core/test-profile.c @@ -1110,11 +1110,7 @@ main (int argc, char *argv[]) #ifndef DBUS_DISABLE_ASSERT g_printerr ("You should probably --disable-asserts before you profile as they have noticeable overhead\n"); #endif - -#if DBUS_ENABLE_VERBOSE_MODE - g_printerr ("You should probably --disable-verbose-mode before you profile as verbose has noticeable overhead\n"); -#endif - + payload = g_malloc (PAYLOAD_SIZE); /* The actual size of the DBusMessage on the wire, as of Nov 23 2004, -- 1.7.5.4