[Commits] [SCM] claws branch, master, updated. 3.17.3-179-g11a1c49

[ticho at claws-mail.org]

The branch, master has been updated
       via  11a1c49cdbcc5dcafa5fdadfb47adc1588c164e6 (commit)
      from  1452caa22726992296a5a68904891661b03821b6 (commit)

Summary of changes:
 src/common/log.c |   14 +++++++-------
 src/common/log.h |    1 +
 2 files changed, 8 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 11a1c49cdbcc5dcafa5fdadfb47adc1588c164e6
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue May 14 16:15:10 2019 +0200

    Move log timestamp format string to a separate macro in log.h

diff --git a/src/common/log.c b/src/common/log.c
index 1a399b8..5540a89 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -199,7 +199,7 @@ void log_print(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -230,7 +230,7 @@ void log_message(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -264,7 +264,7 @@ void log_warning(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -298,7 +298,7 @@ void log_error(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -332,7 +332,7 @@ void log_status_ok(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -366,7 +366,7 @@ void log_status_nok(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
@@ -400,7 +400,7 @@ void log_status_skip(LogInstance instance, const gchar *format, ...)
 	struct tm buft;
 
 	time(&t);
-	strftime(buf, LOG_TIME_LEN + 1, "[%Y-%m-%d %H:%M:%S] ", localtime_r(&t, &buft));
+	strftime(buf, LOG_TIME_LEN + 1, LOG_TIME_FORMAT, localtime_r(&t, &buft));
 
 	va_start(args, format);
 	g_vsnprintf(buf + LOG_TIME_LEN, BUFFSIZE, format, args);
diff --git a/src/common/log.h b/src/common/log.h
index f00e837..64bd91a 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -29,6 +29,7 @@
 #define LOG_APPEND_TEXT_HOOKLIST "log_append_text"
 #define DEBUG_FILTERING_APPEND_TEXT_HOOKLIST "debug_append_text"
 
+#define LOG_TIME_FORMAT "[%Y-%m-%d %H:%M:%S] "
 #define LOG_TIME_LEN 22
 
 typedef enum

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail