KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/util: Stop bundling our snprintf implementation. 

Use MSVCRT functions instead.  Their semantics are slightly
different but they can be made to work as expected.

Also, use the same code paths for both MSVCRT and MinGW.

https://bugs.freedesktop.org/show_bug.cgi?id=91418

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Jose Fonseca 2015-07-22 13:21:24 +01:00
parent f3728a16c9
commit c6267ebd6c
3 changed files with 31 additions and 1485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/auxiliary/Makefile.sources
View File

@ -274,7 +274,6 @@ C_SOURCES := \
util/u_simple_shaders.h \
util/u_slab.c \
util/u_slab.h \
util/u_snprintf.c \
util/u_split_prim.h \
util/u_sse.h \
util/u_staging.c \

1480
src/gallium/auxiliary/util/u_snprintf.c
View File

File diff suppressed because it is too large Load Diff

35
src/gallium/auxiliary/util/u_string.h
View File

@ -35,13 +35,14 @@
#ifndef U_STRING_H_
#define U_STRING_H_
#if !defined(_MSC_VER) && !defined(XF86_LIBC_H)
#if !defined(XF86_LIBC_H)
#include <stdio.h>
#endif
#include <stddef.h>
#include <stdarg.h>
#include "pipe/p_compiler.h"
#include "util/macros.h" // PRINTFLIKE
#ifdef __cplusplus
@ -64,10 +65,35 @@ util_strchrnul(const char *s, char c)
#endif
#ifdef _MSC_VER
#ifdef _WIN32
int util_vsnprintf(char *, size_t, const char *, va_list);
int util_snprintf(char *str, size_t size, const char *format, ...);
static inline int
util_vsnprintf(char *str, size_t size, const char *format, va_list ap)
{
/* We need to use _vscprintf to calculate the length as vsnprintf returns -1
* if the number of characters to write is greater than count.
*/
va_list ap_copy;
int ret;
va_copy(ap_copy, ap);
ret = _vsnprintf(str, size, format, ap);
if (ret < 0) {
ret = _vscprintf(format, ap_copy);
}
return ret;
}
static inline int
PRINTFLIKE(3, 4)
util_snprintf(char *str, size_t size, const char *format, ...)
{
va_list ap;
int ret;
va_start(ap, format);
ret = util_vsnprintf(str, size, format, ap);
va_end(ap);
return ret;
}
static inline void
util_vsprintf(char *str, const char *format, va_list ap)
@ -76,6 +102,7 @@ util_vsprintf(char *str, const char *format, va_list ap)
}
static inline void
PRINTFLIKE(2, 3)
util_sprintf(char *str, const char *format, ...)
{
va_list ap;