*
* (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.
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;
}
*/
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)
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";
/*** 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;
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 };
/*** Utility functions ***/
void
-msg(unsigned int cat, const char *fmt, ...)
+msg(uint cat, const char *fmt, ...)
{
va_list args;
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)
{