version: the real 1.2.9, fix another bug from buf.c when input is lon…

…ger than buffer size
HardySimpson · Feb 7, 2013 · 57ca747 · 57ca747
1 parent c351807
commit 57ca747
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/buf.c b/src/buf.c
@@ -244,7 +244,7 @@ int zlog_buf_vprintf(zlog_buf_t * a_buf, const char *format, va_list args)
 		if (rc > 0) {
 			zc_error("conf limit to %ld, can't extend, so truncate", a_buf->size_max);
 			va_copy(ap, args);
-			size_left = a_buf->end_plus_1 - a_buf->start;
+			size_left = a_buf->end_plus_1 - a_buf->tail;
 			vsnprintf(a_buf->tail, size_left, format, ap);
 			a_buf->tail += size_left - 1;
 			//*(a_buf->tail) = '\0';

diff --git a/src/zlog.c b/src/zlog.c
@@ -443,7 +443,6 @@ int dzlog_set_category(const char *cname)
 		}  \
 	}  \
   \
-  zc_error("%d, %d", a_thread->init_version, zlog_env_init_version); \
 	if (a_thread->init_version != zlog_env_init_version) {  \
 		/* as mdc is still here, so can not easily del and new */ \
 		rd = zlog_thread_rebuild_msg_buf(a_thread, \