MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-21 18:26:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[misc] Change name of string_printf to safe_asprintf

Browse Source
This commit is contained in:
ejurgensen
2017-05-05 20:00:51 +02:00
parent dcf75f59eb
commit 1aa8072e68
4 changed files with 150 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/misc.c
View File

@@ -287,6 +287,27 @@ safe_strdup(const char *str)
return strdup(str);
}
/*
* Wrapper function for vasprintf by Intel Corporation
* Published under the L-GPL 2.1 licence as part of clr-boot-manager
*
* https://github.com/clearlinux/clr-boot-manager
*/
char *
safe_asprintf(const char *fmt, ...)
{
char *ret = NULL;
va_list va;
va_start(va, fmt);
if (vasprintf(&ret, fmt, va) < 0)
{
DPRINTF(E_FATAL, L_MISC, "Out of memory for safe_asprintf\n");
abort();
}
va_end(va);
return ret;
}
/* Key/value functions */
struct keyval *
@@ -1134,24 +1155,4 @@ log_fatal_null(int domain, const char *func, int line)
abort();
}
/*
* Wrapper function for vasprintf by Intel Corporation
* Published under the L-GPL 2.1 licence as part of clr-boot-manager
*
* https://github.com/clearlinux/clr-boot-manager
*/
char *string_printf(const char *fmt, ...)
{
char *ret = NULL;
va_list va;
va_start(va, fmt);
if (vasprintf(&ret, fmt, va) < 0)
{
DPRINTF(E_FATAL, L_MISC, "Out of memory for string_printf\n");
abort();
}
va_end(va);
return ret;
}