summaryrefslogtreecommitdiff
path: root/common/gdm-log.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2007-08-28 20:06:58 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2007-08-28 20:06:58 +0000
commit77b6d6f45367ebf5e0a045a0a7ec7efadd3eb5fa (patch)
treeadeadb2ab532f60cf2952584935f4088b7569dd5 /common/gdm-log.c
parentaf364b9934700cc5641717dfa97ecd40e0657944 (diff)
downloadgdm-77b6d6f45367ebf5e0a045a0a7ec7efadd3eb5fa.tar.gz
Mass change tabs to spaces. Tabs suck.
2007-08-28 William Jon McCann <mccann@jhu.edu> * common/gdm-address.c: * common/gdm-address.h: * common/gdm-common.c: * common/gdm-common.h: * common/gdm-log.c: * common/gdm-log.h: * common/gdm-md5.c: * common/gdm-md5.h: * common/gdm-settings-backend.c: * common/gdm-settings-backend.h: * common/gdm-settings-client.c: * common/gdm-settings-client.h: * common/gdm-settings-desktop-backend.c: * common/gdm-settings-desktop-backend.h: * common/gdm-settings-direct.c: * common/gdm-settings-direct.h: * common/gdm-settings-keys.h: * common/gdm-settings-utils.c: * common/gdm-settings-utils.h: * common/gdm-settings.c: * common/gdm-settings.h: * common/gdm-signal-handler.c: * common/gdm-signal-handler.h: * common/ve-signal.c: * common/ve-signal.h: * daemon/auth.c: * daemon/choose.c: * daemon/choose.h: * daemon/factory-slave-main.c: * daemon/filecheck.c: * daemon/gdm-display-factory.c: * daemon/gdm-display-factory.h: * daemon/gdm-display-store.c: * daemon/gdm-display-store.h: * daemon/gdm-display.c: * daemon/gdm-display.h: * daemon/gdm-factory-slave.c: * daemon/gdm-factory-slave.h: * daemon/gdm-greeter-proxy.c: * daemon/gdm-greeter-proxy.h: * daemon/gdm-greeter-server.c: * daemon/gdm-greeter-server.h: * daemon/gdm-local-display-factory.c: * daemon/gdm-local-display-factory.h: * daemon/gdm-manager.c: * daemon/gdm-manager.h: * daemon/gdm-product-display.c: * daemon/gdm-product-display.h: * daemon/gdm-product-slave.c: * daemon/gdm-product-slave.h: * daemon/gdm-server.c: * daemon/gdm-server.h: * daemon/gdm-session-relay.c: * daemon/gdm-session-relay.h: * daemon/gdm-session-worker-job.c: * daemon/gdm-session-worker-job.h: * daemon/gdm-session-worker.c: * daemon/gdm-session-worker.h: * daemon/gdm-session.c: * daemon/gdm-session.h: * daemon/gdm-simple-slave.c: * daemon/gdm-simple-slave.h: * daemon/gdm-slave-proxy.c: * daemon/gdm-slave-proxy.h: * daemon/gdm-slave.c: * daemon/gdm-slave.h: * daemon/gdm-static-display.c: * daemon/gdm-static-display.h: * daemon/gdm-static-factory-display.c: * daemon/gdm-static-factory-display.h: * daemon/gdm-xdmcp-display-factory.c: * daemon/gdm-xdmcp-display-factory.h: * daemon/gdm-xdmcp-display.c: * daemon/gdm-xdmcp-display.h: * daemon/main.c: * daemon/product-slave-main.c: * daemon/session-worker-main.c: * daemon/simple-slave-main.c: * daemon/test-hal-seats.c: * daemon/test-session.c: * gui/simple-greeter/gdm-simple-greeter.c: * gui/simple-greeter/gdm-simple-greeter.h: * gui/simple-greeter/greeter-main.c: * libgreeter/gdm-greeter.c: * libgreeter/gdm-greeter.h: * libgreeter/gdmlanguages.c: * libgreeter/gdmsession.c: Mass change tabs to spaces. Tabs suck. svn path=/branches/mccann-gobject/; revision=5196
Diffstat (limited to 'common/gdm-log.c')
-rw-r--r--common/gdm-log.c252
1 files changed, 126 insertions, 126 deletions
diff --git a/common/gdm-log.c b/common/gdm-log.c
index a4777802..29476b3f 100644
--- a/common/gdm-log.c
+++ b/common/gdm-log.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
*
@@ -41,163 +41,163 @@ static int syslog_levels = (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LO
static void
log_level_to_priority_and_prefix (GLogLevelFlags log_level,
- int *priorityp,
- const char **prefixp)
+ int *priorityp,
+ const char **prefixp)
{
- int priority;
- const char *prefix;
-
- /* Process the message prefix and priority */
- switch (log_level & G_LOG_LEVEL_MASK) {
- case G_LOG_FLAG_FATAL:
- priority = LOG_EMERG;
- prefix = "FATAL";
- break;
- case G_LOG_LEVEL_ERROR:
- priority = LOG_ERR;
- prefix = "ERROR";
- break;
- case G_LOG_LEVEL_CRITICAL:
- priority = LOG_CRIT;
- prefix = "CRITICAL";
- break;
- case G_LOG_LEVEL_WARNING:
- priority = LOG_WARNING;
- prefix = "WARNING";
- break;
- case G_LOG_LEVEL_MESSAGE:
- priority = LOG_NOTICE;
- prefix = "MESSAGE";
- break;
- case G_LOG_LEVEL_INFO:
- priority = LOG_INFO;
- prefix = "INFO";
- break;
- case G_LOG_LEVEL_DEBUG:
- /* if debug was requested then bump this up to ERROR
- * to ensure it is seen in a log */
- if (syslog_levels & G_LOG_LEVEL_DEBUG) {
- priority = LOG_WARNING;
- } else {
- priority = LOG_DEBUG;
- }
- prefix = "DEBUG";
- break;
- default:
- priority = LOG_DEBUG;
- prefix = "UNKNOWN";
- break;
- }
-
- if (priorityp != NULL) {
- *priorityp = priority;
- }
- if (prefixp != NULL) {
- *prefixp = prefix;
- }
+ int priority;
+ const char *prefix;
+
+ /* Process the message prefix and priority */
+ switch (log_level & G_LOG_LEVEL_MASK) {
+ case G_LOG_FLAG_FATAL:
+ priority = LOG_EMERG;
+ prefix = "FATAL";
+ break;
+ case G_LOG_LEVEL_ERROR:
+ priority = LOG_ERR;
+ prefix = "ERROR";
+ break;
+ case G_LOG_LEVEL_CRITICAL:
+ priority = LOG_CRIT;
+ prefix = "CRITICAL";
+ break;
+ case G_LOG_LEVEL_WARNING:
+ priority = LOG_WARNING;
+ prefix = "WARNING";
+ break;
+ case G_LOG_LEVEL_MESSAGE:
+ priority = LOG_NOTICE;
+ prefix = "MESSAGE";
+ break;
+ case G_LOG_LEVEL_INFO:
+ priority = LOG_INFO;
+ prefix = "INFO";
+ break;
+ case G_LOG_LEVEL_DEBUG:
+ /* if debug was requested then bump this up to ERROR
+ * to ensure it is seen in a log */
+ if (syslog_levels & G_LOG_LEVEL_DEBUG) {
+ priority = LOG_WARNING;
+ } else {
+ priority = LOG_DEBUG;
+ }
+ prefix = "DEBUG";
+ break;
+ default:
+ priority = LOG_DEBUG;
+ prefix = "UNKNOWN";
+ break;
+ }
+
+ if (priorityp != NULL) {
+ *priorityp = priority;
+ }
+ if (prefixp != NULL) {
+ *prefixp = prefix;
+ }
}
void
gdm_log_default_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer unused_data)
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer unused_data)
{
- GString *gstring;
- int priority;
- const char *level_prefix;
- char *string;
- gboolean do_log;
- gboolean is_fatal;
-
- is_fatal = (log_level & G_LOG_FLAG_FATAL) != 0;
-
- do_log = (log_level & syslog_levels);
- if (! do_log) {
- return;
- }
-
- if (! initialized) {
- gdm_log_init ();
- }
-
- log_level_to_priority_and_prefix (log_level,
- &priority,
- &level_prefix);
-
- gstring = g_string_new (NULL);
-
- if (log_domain != NULL) {
- g_string_append (gstring, log_domain);
- g_string_append_c (gstring, '-');
- }
- g_string_append (gstring, level_prefix);
-
- g_string_append (gstring, ": ");
- if (message == NULL) {
- g_string_append (gstring, "(NULL) message");
- } else {
- g_string_append (gstring, message);
- }
- if (is_fatal) {
- g_string_append (gstring, "\naborting...\n");
- } else {
- g_string_append (gstring, "\n");
- }
-
- string = g_string_free (gstring, FALSE);
-
- syslog (priority, "%s", string);
-
- g_free (string);
+ GString *gstring;
+ int priority;
+ const char *level_prefix;
+ char *string;
+ gboolean do_log;
+ gboolean is_fatal;
+
+ is_fatal = (log_level & G_LOG_FLAG_FATAL) != 0;
+
+ do_log = (log_level & syslog_levels);
+ if (! do_log) {
+ return;
+ }
+
+ if (! initialized) {
+ gdm_log_init ();
+ }
+
+ log_level_to_priority_and_prefix (log_level,
+ &priority,
+ &level_prefix);
+
+ gstring = g_string_new (NULL);
+
+ if (log_domain != NULL) {
+ g_string_append (gstring, log_domain);
+ g_string_append_c (gstring, '-');
+ }
+ g_string_append (gstring, level_prefix);
+
+ g_string_append (gstring, ": ");
+ if (message == NULL) {
+ g_string_append (gstring, "(NULL) message");
+ } else {
+ g_string_append (gstring, message);
+ }
+ if (is_fatal) {
+ g_string_append (gstring, "\naborting...\n");
+ } else {
+ g_string_append (gstring, "\n");
+ }
+
+ string = g_string_free (gstring, FALSE);
+
+ syslog (priority, "%s", string);
+
+ g_free (string);
}
void
gdm_log_toggle_debug (void)
{
- if (syslog_levels & G_LOG_LEVEL_DEBUG) {
- g_debug ("Debugging disabled");
- syslog_levels &= ~G_LOG_LEVEL_DEBUG;
- } else {
- syslog_levels |= G_LOG_LEVEL_DEBUG;
- g_debug ("Debugging enabled");
- }
+ if (syslog_levels & G_LOG_LEVEL_DEBUG) {
+ g_debug ("Debugging disabled");
+ syslog_levels &= ~G_LOG_LEVEL_DEBUG;
+ } else {
+ syslog_levels |= G_LOG_LEVEL_DEBUG;
+ g_debug ("Debugging enabled");
+ }
}
void
gdm_log_set_debug (gboolean debug)
{
- if (debug) {
- syslog_levels |= G_LOG_LEVEL_DEBUG;
- } else {
- syslog_levels &= ~G_LOG_LEVEL_DEBUG;
- }
+ if (debug) {
+ syslog_levels |= G_LOG_LEVEL_DEBUG;
+ } else {
+ syslog_levels &= ~G_LOG_LEVEL_DEBUG;
+ }
}
void
gdm_log_init (void)
{
- const char *prg_name;
- int options;
+ const char *prg_name;
+ int options;
- g_log_set_default_handler (gdm_log_default_handler, NULL);
+ g_log_set_default_handler (gdm_log_default_handler, NULL);
- prg_name = g_get_prgname ();
+ prg_name = g_get_prgname ();
- options = LOG_PID;
+ options = LOG_PID;
#ifdef LOG_PERROR
- options |= LOG_PERROR;
+ options |= LOG_PERROR;
#endif
- openlog (prg_name, options, LOG_DAEMON);
+ openlog (prg_name, options, LOG_DAEMON);
- initialized = TRUE;
+ initialized = TRUE;
}
void
gdm_log_shutdown (void)
{
- closelog ();
- initialized = FALSE;
+ closelog ();
+ initialized = FALSE;
}