emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* cosmetics

This commit is contained in:
Dirk-Jan C. Binnema 2011-05-24 21:35:36 +03:00
parent 2c24a43211
commit 73752ca4a9
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mu-log.c
View File

@ -90,7 +90,6 @@ mu_log_init_silence (void)
return TRUE; return TRUE;
} }
static void static void
log_handler (const gchar* log_domain, GLogLevelFlags log_level, log_handler (const gchar* log_domain, GLogLevelFlags log_level,
const gchar* msg) const gchar* msg)
@ -104,18 +103,19 @@ log_handler (const gchar* log_domain, GLogLevelFlags log_level,
gboolean gboolean
mu_log_init_with_fd (int fd, gboolean doclose, mu_log_init_with_fd (int fd, gboolean doclose,
gboolean quiet, gboolean debug) gboolean quiet, gboolean debug)
{ {
g_return_val_if_fail (!MU_LOG, FALSE); g_return_val_if_fail (!MU_LOG, FALSE);
MU_LOG = g_new(MuLog, 1); MU_LOG = g_new(MuLog, 1);
MU_LOG->_fd = fd; MU_LOG->_fd = fd;
MU_LOG->_quiet = quiet; MU_LOG->_quiet = quiet;
MU_LOG->_debug = debug; MU_LOG->_newline_before_msg = FALSE;
MU_LOG->_own = doclose; /* if we now own the fd, close it MU_LOG->_debug = debug;
MU_LOG->_own = doclose; /* if we now own the fd, close it
* in _destroy */ * in _destroy */
MU_LOG->_old_log_func = MU_LOG->_old_log_func =
g_log_set_default_handler ((GLogFunc)log_handler, NULL); g_log_set_default_handler ((GLogFunc)log_handler, NULL);
return TRUE; return TRUE;
@ -257,15 +257,21 @@ log_write (const char* domain, GLogLevelFlags level,
if (len < 0) if (len < 0)
fprintf (stderr, "%s: failed to write to log: %s\n", fprintf (stderr, "%s: failed to write to log: %s\n",
__FUNCTION__, strerror(errno)); __FUNCTION__, strerror(errno));
if (!(MU_LOG->_quiet) && (level & G_LOG_LEVEL_MESSAGE))
g_print ("mu: %s\n", msg);
if (!(MU_LOG->_quiet) && (level & G_LOG_LEVEL_MESSAGE)) {
fputs ("mu: ", stdout);
fputs (msg, stdout);
fputs ("\n", stdout);
fflush (stdout);
}
/* for serious errors, log them to stderr as well */ /* for serious errors, log them to stderr as well */
if (level & G_LOG_LEVEL_ERROR) if (level & G_LOG_LEVEL_ERROR ||
g_printerr ("mu: %s\n", msg); level & G_LOG_LEVEL_CRITICAL ||
else if (level & G_LOG_LEVEL_CRITICAL) level & G_LOG_LEVEL_WARNING) {
g_printerr ("mu: %s\n", msg); fputs ("mu: ", stderr);
else if (level & G_LOG_LEVEL_WARNING) fputs (msg, stderr);
g_printerr ("mu: %s\n", msg); fputs ("\n", stderr);
fflush (stderr);
}
} }

1
src/mu-log.h
View File

@ -70,6 +70,7 @@ gboolean mu_log_init_silence (void) G_GNUC_WARN_UNUSED_RESULT;
*/ */
void mu_log_uninit (void); void mu_log_uninit (void);
G_END_DECLS G_END_DECLS
#endif /*__MU_LOG_H__*/ #endif /*__MU_LOG_H__*/

2
src/mu.cc
View File

@ -1,3 +1,5 @@
/* -*-mode: c++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8-*- */
/* /*
** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **