* printbuf.c - C. Watford (christopher dot watford at gmail dot com)

Added a Win32/Win64 compliant implementation of vasprintf
  * debug.c - C. Watford (christopher dot watford at gmail dot com)
    Removed usage of vsyslog on Win32/Win64 systems, needs to be handled
    by a configure script
  * json_object.c - C. Watford (christopher dot watford at gmail dot com)
    Added scope operator to wrap usage of json_object_object_foreach, this
    needs to be rethought to be more ANSI C friendly
  * json_object.h - C. Watford (christopher dot watford at gmail dot com)
    Added Microsoft C friendly version of json_object_object_foreach
  * json_tokener.c - C. Watford (christopher dot watford at gmail dot com)
    Added a Win32/Win64 compliant implementation of strndup
  * json_util.c - C. Watford (christopher dot watford at gmail dot com)
    Added cast and mask to suffice size_t v. unsigned int conversion
    correctness
  * json_tokener.c - sign reversal issue on error info for nested object parse
    spotted by Johan Bj�rklund (johbjo09 at kth.se)
  * json_object.c - escape " in json_escape_str
  * Change to automake and libtool to build shared and static library
    Michael Clark <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@4 327403b1-1117-474d-bef2-5cb71233fd97
This commit is contained in:
Michael Clark
2007-03-13 08:26:20 +00:00
parent f0d08887b8
commit 4504df7117
32 changed files with 1704 additions and 159 deletions

50
debug.c
View File

@@ -1,5 +1,5 @@
/*
* $Id: debug.c,v 1.3 2004/08/07 03:11:38 mclark Exp $
* $Id: debug.c,v 1.4 2005/06/14 22:41:51 mclark Exp $
*
* Copyright Metaparadigm Pte. Ltd. 2004.
* Michael Clark <michael@metaparadigm.com>
@@ -16,17 +16,27 @@
*
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <syslog.h>
#include <unistd.h>
#if HAVE_SYSLOG_H
# include <syslog.h>
#endif /* HAVE_SYSLOG_H */
#if HAVE_UNISTD_H
# include <unistd.h>
#endif /* HAVE_UNISTD_H */
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif /* HAVE_SYS_PARAM_H */
#include "debug.h"
static int _syslog = 0;
static int _debug = 0;
@@ -42,8 +52,12 @@ void mc_abort(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
if(_syslog) vsyslog(LOG_ERR, msg, ap);
else vprintf(msg, ap);
#if HAVE_VSYSLOG
if(_syslog) {
vsyslog(LOG_ERR, msg, ap);
} else
#endif
vprintf(msg, ap);
exit(1);
}
@@ -53,8 +67,12 @@ void mc_debug(const char *msg, ...)
va_list ap;
if(_debug) {
va_start(ap, msg);
if(_syslog) vsyslog(LOG_DEBUG, msg, ap);
else vprintf(msg, ap);
#if HAVE_VSYSLOG
if(_syslog) {
vsyslog(LOG_DEBUG, msg, ap);
} else
#endif
vprintf(msg, ap);
}
}
@@ -62,14 +80,22 @@ void mc_error(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
if(_syslog) vsyslog(LOG_ERR, msg, ap);
else vfprintf(stderr, msg, ap);
#if HAVE_VSYSLOG
if(_syslog) {
vsyslog(LOG_ERR, msg, ap);
} else
#endif
vfprintf(stderr, msg, ap);
}
void mc_info(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
if(_syslog) vsyslog(LOG_INFO, msg, ap);
else vfprintf(stderr, msg, ap);
#if HAVE_VSYSLOG
if(_syslog) {
vsyslog(LOG_INFO, msg, ap);
} else
#endif
vfprintf(stderr, msg, ap);
}