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

[Enrico Zini]

The following commit has been merged in the master branch:
commit 14c36fe217fe1338b16a043a340d071de18dc8e2
Author: Enrico Zini <enrico at enricozini.org>
Date:   Sat Jul 9 09:15:29 2011 +0100

    Fix exit reporting messages

diff --git a/xserver.c b/xserver.c
index 75d34c1..9e61c40 100644
--- a/xserver.c
+++ b/xserver.c
@@ -409,9 +409,12 @@ void nodm_xserver_dump_status(struct nodm_xserver* srv)
 void nodm_xserver_report_exit(struct nodm_xserver* s, int status)
 {
     if (WIFEXITED(status))
-        log_warn("X session quit with status %d", WEXITSTATUS(status));
+        log_warn("X server %d quit with status %d",
+               (int)s->pid, WEXITSTATUS(status));
     else if (WIFSIGNALED(status))
-        log_err("X session was killed with signal %d", WTERMSIG(status));
+        log_err("X server %d was killed with signal %d",
+               (int)s->pid, WTERMSIG(status));
     else
-        log_err("X session terminated with unknown status %d", status);
+        log_err("X server %d terminated with unknown status %d",
+               (int)s->pid, status);
 }
diff --git a/xsession.c b/xsession.c
index 65da440..83f5538 100644
--- a/xsession.c
+++ b/xsession.c
@@ -155,9 +155,12 @@ void nodm_xsession_dump_status(struct nodm_xsession* s)
 void nodm_xsession_report_exit(struct nodm_xsession* s, int status)
 {
     if (WIFEXITED(status))
-        log_warn("X session quit with status %d", WEXITSTATUS(status));
+        log_warn("X session %d quit with status %d",
+               (int)s->pid, WEXITSTATUS(status));
     else if (WIFSIGNALED(status))
-        log_warn("X session was killed with signal %d", WTERMSIG(status));
+        log_warn("X session %d was killed with signal %d",
+               (int)s->pid, WTERMSIG(status));
     else
-        log_warn("X session terminated with unknown status %d", status);
+        log_warn("X session %d terminated with unknown status %d",
+               (int)s->pid, status);
 }

-- 
Automatic Display Manager