X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Flog.c;h=4a951e3277dc4bad99eae8a99feeaebece38a4c6;hb=6c4c397f94ec5f5df6bcc178fb5fa4e84d3505fc;hp=aea97e3bd61457d2f0d371021cfe7cfcb0a306f0;hpb=e1b297303866e8a2f7611515a7e90fba483c7000;p=libucw.git

diff --git a/ucw/log.c b/ucw/log.c
index aea97e3b..4a951e32 100644
--- a/ucw/log.c
+++ b/ucw/log.c
@@ -3,6 +3,7 @@
  *
  *	(c) 1997--2009 Martin Mares <mj@ucw.cz>
  *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *	(c) 2014 Tomas Valla <tom@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -33,7 +34,9 @@ static void NONRET do_die(void);
 static int default_log_handler(struct log_stream *ls UNUSED, struct log_msg *m)
 {
   // This is a completely bare version of the log-file module. Errors are ignored.
-  write(2, m->m, m->m_len);
+  if (write(2, m->m, m->m_len) < 0)
+    {
+    }
   return 0;
 }
 
@@ -66,7 +69,7 @@ int log_streams_after = 0;		/* The first never-used index in log_streams.ptr */
  */
 
 struct log_stream *
-log_stream_by_flags(uns flags)
+log_stream_by_flags(uint flags)
 {
   int n = LS_GET_STRNUM(flags);
   if (n < 0 || n >= log_streams_after || log_streams.ptr[n]->regnum == -1)
@@ -79,9 +82,9 @@ log_stream_by_flags(uns flags)
 char **log_type_names;
 
 char *
-log_type_name(uns flags)
+log_type_name(uint flags)
 {
-  uns type = LS_GET_TYPE(flags);
+  uint type = LS_GET_TYPE(flags);
 
   if (!log_type_names || !log_type_names[type])
     return "default";
@@ -92,7 +95,7 @@ log_type_name(uns flags)
 /*** Logging ***/
 
 void
-vmsg(uns cat, const char *fmt, va_list args)
+vmsg(uint cat, const char *fmt, va_list args)
 {
   struct timeval tv;
   struct tm tm;
@@ -102,7 +105,7 @@ vmsg(uns cat, const char *fmt, va_list args)
   char msgbuf[256];
   char *p;
   int len;
-  uns sighandler = cat & L_SIGHANDLER;
+  uint sighandler = cat & L_SIGHANDLER;
   struct log_stream *ls;
   struct log_msg m = { .flags = cat };
 
@@ -340,7 +343,7 @@ log_pass_msg(struct log_stream *ls, struct log_msg *m)
 /*** Utility functions ***/
 
 void
-msg(unsigned int cat, const char *fmt, ...)
+msg(uint cat, const char *fmt, ...)
 {
   va_list args;
 
@@ -386,6 +389,16 @@ assert_failed(const char *assertion, const char *file, int line)
   abort();
 }
 
+void
+assert_failed_msg(const char *assertion, const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vmsg(L_DEBUG, fmt, args);
+  msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
+  abort();
+}
+
 void
 assert_failed_noinfo(void)
 {