--- a/src/irc_conn.c	Tue May 05 03:15:25 2009 +0300
+++ b/src/irc_conn.c	Thu May 07 02:11:41 2009 +0300
@@ -230,7 +230,7 @@
 
     } else {
         // log
-        log_err_info(err, "line_proto error");
+        log_error(err, "transport error");
         
         // trash ourselves
         irc_conn_set_error(conn, err);

--- a/src/irc_net.c	Tue May 05 03:15:25 2009 +0300
+++ b/src/irc_net.c	Thu May 07 02:11:41 2009 +0300
@@ -62,14 +62,14 @@
     (void) conn;
     
     // log an error
-    log_err_info(err, "irc_conn failed");
+    log_error(err, "irc_conn error");
     
     // tear down state
     irc_net_disconnect(net);
     
     // reconnect, either right away, or at the five-minute interval
     if (irc_net_connect(net, (time(NULL) - net->connected_ts > IRC_NET_RECONNECT_INTERVAL), err))
-        log_err_info(err, "unable to reconnect");
+        log_error(err, "unable to reconnect");
 }
 
 /**

--- a/src/log.c	Tue May 05 03:15:25 2009 +0300
+++ b/src/log.c	Thu May 07 02:11:41 2009 +0300
@@ -114,7 +114,7 @@
     va_end(vargs);
 }
 
-void _log_err_code (enum log_level level, err_t err, const char *func, const char *format, ...)
+void _log_err (enum log_level level, err_t err, const char *func, const char *format, ...)
 {
     va_list vargs;
 
@@ -124,7 +124,7 @@
     va_end(vargs);
 }
 
-void _log_err (enum log_level level, const error_t *err, const char *func, const char *format, ...)
+void _log_error (enum log_level level, const error_t *err, const char *func, const char *format, ...)
 {
     va_list vargs;
 

--- a/src/log.h	Tue May 05 03:15:25 2009 +0300
+++ b/src/log.h	Thu May 07 02:11:41 2009 +0300
@@ -64,19 +64,19 @@
 #define log_debug(...) log_msg(LOG_DEBUG, __func__, __VA_ARGS__)
 #define log_info(...)  log_msg(LOG_INFO,  __func__, __VA_ARGS__)
 #define log_warn(...)  log_msg(LOG_WARN,  __func__, __VA_ARGS__)
-#define log_error(...) log_msg(LOG_ERROR, __func__, __VA_ARGS__)
+/* #define log_error(...) log_msg(LOG_ERROR, __func__, __VA_ARGS__) */
 #define log_fatal(...) log_msg(LOG_FATAL, __func__, __VA_ARGS__)
 
 /**
  * Log a message with the given level, appending the formatted error code name
  */
-void _log_err_code (enum log_level level, err_t err, const char *func, const char *format, ...)
+void _log_err (enum log_level level, err_t err, const char *func, const char *format, ...)
     __attribute__ ((format (printf, 4, 5)));
 
 /**
  * Log a message with the given level, appending the formatted error message
  */
-void _log_err (enum log_level level, const error_t *err, const char *func, const char *format, ...)
+void _log_error (enum log_level level, const error_t *err, const char *func, const char *format, ...)
     __attribute__ ((format (printf, 4, 5)));
 
 /**
@@ -90,12 +90,12 @@
  *
  * XXX: kill log_err_info, add log_err_code
  */
-#define log_err(err_code, ...) _log_err_code(LOG_ERROR, err_code, __func__, __VA_ARGS__)
-#define log_err_info(err_info, ...) _log_err(LOG_ERROR, err_info, __func__, __VA_ARGS__)
+#define log_err(err_code, ...) _log_err(LOG_ERROR, err_code, __func__, __VA_ARGS__)
+#define log_error(err_info, ...) _log_error(LOG_ERROR, err_info, __func__, __VA_ARGS__)
 #define log_perr(...) _log_perr(LOG_ERROR, __func__, __VA_ARGS__)
 
-#define log_warn_err_code(err_code, ...) _log_err_code(LOG_WARN, err_code, __func__, __VA_ARGS__)
-#define log_warn_err(err_info, ...) _log_err(LOG_WARN, err_info, __func__, __VA_ARGS__)
+#define log_warn_err(err_code, ...) _log_err(LOG_WARN, err_code, __func__, __VA_ARGS__)
+#define log_warn_error(err_info, ...) _log_error(LOG_WARN, err_info, __func__, __VA_ARGS__)
 
 /**
  * log_fatal + exit failure
@@ -105,12 +105,12 @@
 /**
  * log_err + exit failure
  */
-#define FATAL_ERR(err_code, ...) do { _log_err_code(LOG_FATAL, err_code, __func__, __VA_ARGS__); abort(); } while (0)
+#define FATAL_ERR(err_code, ...) do { _log_err(LOG_FATAL, err_code, __func__, __VA_ARGS__); abort(); } while (0)
 
 /**
  * log_err_info + exit failure
  */
-#define FATAL_ERROR(err_info, ...) do { _log_err(LOG_FATAL, err_info, __func__, __VA_ARGS__); abort(); } while (0)
+#define FATAL_ERROR(err_info, ...) do { _log_error(LOG_FATAL, err_info, __func__, __VA_ARGS__); abort(); } while (0)
 
 /**
  * log_perr + exit failure

--- a/src/modules/irc_log.c	Tue May 05 03:15:25 2009 +0300
+++ b/src/modules/irc_log.c	Thu May 07 02:11:41 2009 +0300
@@ -92,7 +92,7 @@
 
     // check errors
     if ((err = evsql_result_check(res)))
-        log_error("irc_log_event: %s", evsql_result_error(res));
+        log_warn("irc_log_event: %s", evsql_result_error(res));
 
     // ok, don't need the result anymore
     evsql_result_free(res);
@@ -150,7 +150,7 @@
         network, channel, nickname, username, hostname, type, target, message
     )) == NULL) {
         // XXX: get evsql_query error info somehow...
-        log_error("evsql_query_exec failed for %s:%s - %s!%s@%s - %s -> %s - %s", 
+        log_warn("evsql_query_exec failed for %s:%s - %s!%s@%s - %s -> %s - %s", 
             network, channel, nickname, username, hostname, type, target, message
         );
 

--- a/src/signals.c	Tue May 05 03:15:25 2009 +0300
+++ b/src/signals.c	Thu May 07 02:11:41 2009 +0300
@@ -108,10 +108,10 @@
     
     // add the set of default signals
     if (signal_ignore(SIGPIPE, &err))
-        log_err_info(&err, "signal_ignore(SIGPIPE)");
+        log_error(&err, "signal_ignore(SIGPIPE)");
 
     if ((ERROR_CODE(&err) = signals_add(signals, SIGINT, &signals_loopexit, signals))) {
-        log_err_info(&err, "signals_add(SIGINT)");
+        log_error(&err, "signals_add(SIGINT)");
         goto error;
     }