diff options
| author | Michael Plante <michael.plante@gmail.com> | 2010-04-15 23:25:28 +0100 |
|---|---|---|
| committer | Michael Plante <michael.plante@gmail.com> | 2010-04-15 23:25:28 +0100 |
| commit | 630747c549d5ff04315e5b851c687d40b8f424fd (patch) | |
| tree | 4fd7a0b5f6f854724ad5ce01a1801dc55ca0b714 | |
| parent | 0b64e01b6150d330a2255b28568e0c659ce8467c (diff) | |
| download | libusb-630747c549d5ff04315e5b851c687d40b8f424fd.tar.gz | |
more explicit toggable debug options
also re-added usbi_dbg() default context creation message
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libusb/core.c | 1 | ||||
| -rw-r--r-- | msvc/config.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 323c54e..1466d57 100644 --- a/configure.ac +++ b/configure.ac @@ -105,17 +105,17 @@ if test "x$log_enabled" != "xno"; then fi AC_ARG_ENABLE([debug-log], [AS_HELP_STRING([--enable-debug-log], - [enable non-toggable debug logging (default n)])], + [force all logging, including debug (default n)])], [debug_log_enabled=$enableval], [debug_log_enabled='no']) AC_ARG_ENABLE([toggable-debug], [AS_HELP_STRING([--enable-toggable-debug], - [enable toggable debug logging (default n)])], + [enable software control of debug logging (default n)])], [toggable_debug=$enableval], [toggable_debug='no']) if test "x$debug_log_enabled" != "xno"; then - AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging (non toggable)]) + AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging (forced)]) else if test "x$toggable_debug" != "xno"; then AC_DEFINE([INCLUDE_DEBUG_LOGGING], 1, [Debug message logging (toggable)]) diff --git a/libusb/core.c b/libusb/core.c index d0013ec..445f2e7 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -1505,6 +1505,7 @@ API_EXPORTED int LIBUSB_API libusb_init(libusb_context **context) // default context should be initialized before any call to usbi_dbg if (!usbi_default_context) { usbi_default_context = ctx; + usbi_dbg("created default context"); } usbi_dbg(""); diff --git a/msvc/config.h b/msvc/config.h index eb58f27..8dc8840 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -8,7 +8,7 @@ /* Default visibility */ #define API_EXPORTED /**/ -/* Debug message logging (non toggable) */ +/* Debug message logging (forced) */ //#define ENABLE_DEBUG_LOGGING 1 /* Debug message logging (toggable) */ |