Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-10-13 02:48:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[common] numerious bad usage bug fixes

Browse Source
This commit is contained in:
Geoffrey McRae
2020-01-10 15:23:49 +11:00
parent 76fa390e3d
commit 22f04a926f
8 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/stringutils.c
View File

@@ -21,26 +21,24 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdlib.h>
#include <stdarg.h>
int alloc_sprintf(char ** str, const char * format, ...)
static int valloc_sprintf(char ** str, const char * format, va_list ap)
{
if (!str)
return -1;
*str = NULL;
va_list ap;
va_start(ap, format);
int len = vsnprintf(NULL, 0, format, ap);
va_end(ap);
va_list ap1;
va_copy(ap1, ap);
int len = vsnprintf(NULL, 0, format, ap1);
va_end(ap1);
if (len < 0)
return len;
*str = malloc(len+1);
va_start(ap, format);
int ret = vsnprintf(*str, len + 1, format, ap);
va_end(ap);
if (ret < 0)
{
free(*str);
@@ -48,5 +46,14 @@ int alloc_sprintf(char ** str, const char * format, ...)
return ret;
}
return ret;
}
int alloc_sprintf(char ** str, const char * format, ...)
{
va_list ap;
va_start(ap, format);
int ret = valloc_sprintf(str, format, ap);
va_end(ap);
return ret;
}