forked from KolibriOS/kolibrios
ddk: v4.5.7
git-svn-id: svn://kolibrios.org@6936 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
@@ -13,24 +13,42 @@
|
||||
/* Simplified asprintf. */
|
||||
char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
|
||||
{
|
||||
unsigned int len;
|
||||
unsigned int first, second;
|
||||
char *p;
|
||||
va_list aq;
|
||||
|
||||
va_copy(aq, ap);
|
||||
len = vsnprintf(NULL, 0, fmt, aq);
|
||||
first = vsnprintf(NULL, 0, fmt, aq);
|
||||
va_end(aq);
|
||||
|
||||
p = kmalloc(len+1, gfp);
|
||||
p = kmalloc(first+1, gfp);
|
||||
if (!p)
|
||||
return NULL;
|
||||
|
||||
vsnprintf(p, len+1, fmt, ap);
|
||||
second = vsnprintf(p, first+1, fmt, ap);
|
||||
WARN(first != second, "different return values (%u and %u) from vsnprintf(\"%s\", ...)",
|
||||
first, second, fmt);
|
||||
|
||||
return p;
|
||||
}
|
||||
EXPORT_SYMBOL(kvasprintf);
|
||||
|
||||
/*
|
||||
* If fmt contains no % (or is exactly %s), use kstrdup_const. If fmt
|
||||
* (or the sole vararg) points to rodata, we will then save a memory
|
||||
* allocation and string copy. In any case, the return value should be
|
||||
* freed using kfree_const().
|
||||
*/
|
||||
const char *kvasprintf_const(gfp_t gfp, const char *fmt, va_list ap)
|
||||
{
|
||||
if (!strchr(fmt, '%'))
|
||||
return strdup(fmt);
|
||||
if (!strcmp(fmt, "%s"))
|
||||
return strdup(va_arg(ap, const char*));
|
||||
return kvasprintf(gfp, fmt, ap);
|
||||
}
|
||||
EXPORT_SYMBOL(kvasprintf_const);
|
||||
|
||||
char *kasprintf(gfp_t gfp, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
Reference in New Issue
Block a user