zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'strmake_asprintf' into 'master'

Browse source 
Draft: tools: Implement strmake() using asprintf().

See merge request wine/wine!4976
This commit is contained in:
Brendan Shanks 2024-11-18 10:10:36 +00:00
commit 07dffb5e12
1 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
tools/tools.h
View file

@ -137,6 +137,40 @@ static inline char *xstrdup( const char *str )
return strcpy( xmalloc( strlen(str)+1 ), str );
}
static int xvasprintf( char **ret, const char *format, va_list ap ) __attribute__ ((__format__ (__printf__, 2, 0)));
static inline int xvasprintf( char **ret, const char *fmt, va_list ap )
{
#ifdef _WIN32
int n;
char *p;
va_list copy;
size_t size = 100;
for (;;)
{
p = xmalloc( size );
va_copy( copy, ap );
n = vsnprintf( p, size, fmt, copy );
va_end( copy );
if (n == -1) size *= 2;
else if ((size_t)n >= size) size = n + 1;
else break;
free( p );
}
*ret = p;
return n;
#else
int n = vasprintf( ret, fmt, ap );
if (n == -1)
{
fprintf( stderr, "Virtual memory exhausted.\n" );
exit(1);
}
return n;
#endif
}
static inline int strendswith( const char *str, const char *end )
{
int l = strlen( str );
@ -147,21 +181,13 @@ static inline int strendswith( const char *str, const char *end )
static char *strmake( const char* fmt, ... ) __attribute__ ((__format__ (__printf__, 1, 2)));
static inline char *strmake( const char* fmt, ... )
{
int n;
size_t size = 100;
va_list ap;
char *ret;
for (;;)
{
char *p = xmalloc( size );
va_start( ap, fmt );
n = vsnprintf( p, size, fmt, ap );
va_end( ap );
if (n == -1) size *= 2;
else if ((size_t)n >= size) size = n + 1;
else return p;
free( p );
}
va_start( ap, fmt );
xvasprintf( &ret, fmt, ap );
va_end( ap );
return ret;
}
/* string array functions */