mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-21 22:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

vasprintf_compat.h: spin-off this compat header ; use math_compat.h as template

Browse Source 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean
2016-11-16 17:04:41 +02:00
parent 8cb86a583a
commit 47f32a76ef
7 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -37,6 +37,7 @@ set(JSON_C_HEADERS
./linkhash.h
./math_compat.h
./strdup_compat.h
./vasprintf_compat.h
./printbuf.h
./random_seed.h
)

1
Makefile.am
View File

@@ -33,6 +33,7 @@ libjson_cinclude_HEADERS = \
linkhash.h \
math_compat.h \
strdup_compat.h \
vasprintf_compat.h \
printbuf.h \
random_seed.h

1
json-c.vcxproj
View File

@@ -152,6 +152,7 @@ copy json_config.h.win32 json_config.h
<ClInclude Include="linkhash.h" />
<ClInclude Include="math_compat.h" />
<ClInclude Include="strdup_compat.h" />
<ClInclude Include="vasprintf_compat.h" />
<ClInclude Include="printbuf.h" />
<ClInclude Include="random_seed.h" />
</ItemGroup>

3
json-c.vcxproj.filters
View File

@@ -83,6 +83,9 @@
<ClInclude Include="strdup_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="vasprintf_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="random_seed.h">
<Filter>Header Files</Filter>
</ClInclude>

1
json_pointer.c
View File

@@ -17,6 +17,7 @@
#include "json_pointer.h"
#include "strdup_compat.h"
#include "vasprintf_compat.h"
/**
* JavaScript Object Notation (JSON) Pointer

42
printbuf.c
View File

@@ -27,6 +27,7 @@
#include "debug.h"
#include "printbuf.h"
#include "vasprintf_compat.h"
static int printbuf_extend(struct printbuf *p, int min_size);
@@ -110,47 +111,6 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
return 0;
}
#if !defined(HAVE_VSNPRINTF) && defined(_MSC_VER)
# define vsnprintf _vsnprintf
#elif !defined(HAVE_VSNPRINTF) /* !HAVE_VSNPRINTF */
# error Need vsnprintf!
#endif /* !HAVE_VSNPRINTF && defined(WIN32) */
#if !defined(HAVE_VASPRINTF)
/* CAW: compliant version of vasprintf */
static int vasprintf(char **buf, const char *fmt, va_list ap)
{
#ifndef WIN32
static char _T_emptybuffer = '\0';
#endif /* !defined(WIN32) */
int chars;
char *b;
if(!buf) { return -1; }
#ifdef WIN32
chars = _vscprintf(fmt, ap)+1;
#else /* !defined(WIN32) */
/* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite
our buffer like on some 64bit sun systems.... but hey, its time to move on */
chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap)+1;
if(chars < 0) { chars *= -1; } /* CAW: old glibc versions have this problem */
#endif /* defined(WIN32) */
b = (char*)malloc(sizeof(char)*chars);
if(!b) { return -1; }
if((chars = vsprintf(b, fmt, ap)) < 0)
{
free(b);
} else {
*buf = b;
}
return chars;
}
#endif /* !HAVE_VASPRINTF */
int sprintbuf(struct printbuf *p, const char *msg, ...)
{
va_list ap;

45
vasprintf_compat.h Normal file
View File

@@ -0,0 +1,45 @@
#ifndef __vasprintf_compat_h
#define __vasprintf_compat_h
#if !defined(HAVE_VSNPRINTF) && defined(_MSC_VER)
# define vsnprintf _vsnprintf
#elif !defined(HAVE_VSNPRINTF) /* !HAVE_VSNPRINTF */
# error Need vsnprintf!
#endif /* !HAVE_VSNPRINTF && defined(WIN32) */
#if !defined(HAVE_VASPRINTF)
/* CAW: compliant version of vasprintf */
static int vasprintf(char **buf, const char *fmt, va_list ap)
{
#ifndef WIN32
static char _T_emptybuffer = '\0';
#endif /* !defined(WIN32) */
int chars;
char *b;
if(!buf) { return -1; }
#ifdef WIN32
chars = _vscprintf(fmt, ap)+1;
#else /* !defined(WIN32) */
/* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite
our buffer like on some 64bit sun systems.... but hey, its time to move on */
chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap)+1;
if(chars < 0) { chars *= -1; } /* CAW: old glibc versions have this problem */
#endif /* defined(WIN32) */
b = (char*)malloc(sizeof(char)*chars);
if(!b) { return -1; }
if((chars = vsprintf(b, fmt, ap)) < 0)
{
free(b);
} else {
*buf = b;
}
return chars;
}
#endif /* !HAVE_VASPRINTF */
#endif /* __vasprintf_compat_h */