projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use wrbuf_puts rather than wrbuf_printf for GRS-1 display.
[yaz-moved-to-github.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index
4ff5e18
..
351c0bd
100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.46 2007-02-05 17:51:48 adam Exp $
+ * $Id: log.c,v 1.48 2007-02-23 10:15:01 adam Exp $
*/
/**
*/
/**
@@
-36,6
+36,7
@@
#include <time.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
#include <time.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
+#include <yaz/snprintf.h>
#include <yaz/xmalloc.h>
static NMEM_MUTEX log_mutex = 0;
#include <yaz/xmalloc.h>
static NMEM_MUTEX log_mutex = 0;
@@
-388,7
+389,7
@@
static void yaz_strftime(char *dst, size_t sz,
#ifdef WIN32
DWORD tid = GetCurrentThreadId();
#else
#ifdef WIN32
DWORD tid = GetCurrentThreadId();
#else
- long tid = 0;
+ pthread_t tid = 0;
#if YAZ_POSIX_THREADS
tid = pthread_self();
#endif
#if YAZ_POSIX_THREADS
tid = pthread_self();
#endif
@@
-472,17
+473,8
@@
void yaz_log(int level, const char *fmt, ...)
if (!(level & l_level))
return;
va_start(ap, fmt);
if (!(level & l_level))
return;
va_start(ap, fmt);
-#ifdef WIN32
- _vsnprintf(buf, sizeof(buf)-1, fmt, ap);
-#else
-/* !WIN32 */
-#if HAVE_VSNPRINTF
- vsnprintf(buf, sizeof(buf), fmt, ap);
-#else
- vsprintf(buf, fmt, ap);
-#endif
-#endif
-/* WIN32 */
+
+ yaz_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
if (o_level & YLOG_ERRNO)
{
strcat(buf, " [");
if (o_level & YLOG_ERRNO)
{
strcat(buf, " [");