[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.8-1-10-gb645dd1

[Enrico Zini]

The following commit has been merged in the master branch:
commit b645dd1098f29210b623b605c2561d0b17ab3f40
Author: Enrico Zini <enrico at enricozini.org>
Date:   Sat Jul 9 01:10:50 2011 +0200

    Fixed log level enforcement

diff --git a/log.c b/log.c
index efa3781..04dba46 100644
--- a/log.c
+++ b/log.c
@@ -70,7 +70,7 @@ static void log_common(int prio, const char* fmt, va_list ap)
 
 void log_verb(const char* fmt, ...)
 {
-    if (!config->log_level < NODM_LL_VERB) return;
+    if (config->log_level < NODM_LL_VERB) return;
 
     va_list ap;
     va_start(ap, fmt);
@@ -80,7 +80,7 @@ void log_verb(const char* fmt, ...)
 
 void log_info(const char* fmt, ...)
 {
-    if (!config->log_level < NODM_LL_INFO) return;
+    if (config->log_level < NODM_LL_INFO) return;
 
     va_list ap;
     va_start(ap, fmt);
@@ -90,7 +90,7 @@ void log_info(const char* fmt, ...)
 
 void log_warn(const char* fmt, ...)
 {
-    if (!config->log_level < NODM_LL_WARN) return;
+    if (config->log_level < NODM_LL_WARN) return;
 
     va_list ap;
     va_start(ap, fmt);
@@ -100,7 +100,7 @@ void log_warn(const char* fmt, ...)
 
 void log_err(const char* fmt, ...)
 {
-    if (!config->log_level < NODM_LL_ERR) return;
+    if (config->log_level < NODM_LL_ERR) return;
 
     va_list ap;
     va_start(ap, fmt);
diff --git a/test-xsession.c b/test-xsession.c
index cb28c3a..d40418d 100644
--- a/test-xsession.c
+++ b/test-xsession.c
@@ -70,7 +70,7 @@ int test_session_x_killer(struct nodm_xsession_child* s)
 // X server starts, X session quits with success
 void test_trivial_session()
 {
-    log_verbose("test_trivial_session");
+    log_verb("test_trivial_session");
     struct nodm_display_manager dm;
     test_setup_dm(&dm, NULL);
     dm.session.child_body = test_session;
@@ -86,7 +86,7 @@ void test_trivial_session()
 // X server does not start
 void test_bad_x_server()
 {
-    log_verbose("test_bad_x_server");
+    log_verb("test_bad_x_server");
     struct nodm_display_manager dm;
     test_setup_dm(&dm, "/bin/false");
     dm.session.child_body = test_session;
@@ -107,7 +107,7 @@ void test_bad_x_server()
 // X server starts, X session quits with error
 void test_failing_x_session()
 {
-    log_verbose("test_failing_x_session");
+    log_verb("test_failing_x_session");
     struct nodm_display_manager dm;
     test_setup_dm(&dm, NULL);
     dm.session.child_body = test_session_bad;
@@ -126,7 +126,7 @@ void test_failing_x_session()
 // X server starts, X session starts, then server dies
 void test_dying_x_server()
 {
-    log_verbose("test_dying_x_server");
+    log_verb("test_dying_x_server");
     struct nodm_display_manager dm;
     test_setup_dm(&dm, NULL);
     dm.session.child_body = test_session_x_killer;

-- 
Automatic Display Manager