Changes in uspace/lib/c/generic/io/asprintf.c [163e34c:28a5ebd] in mainline

File:

• uspace/lib/c/generic/io/asprintf.c (modified) (3 diffs)

uspace/lib/c/generic/io/asprintf.c

@@ -39 +39 @@
 #include <stddef.h>
 #include <str.h>
-#include <printf_core.h>
+#include <io/printf_core.h>
+
+static int asprintf_str_write(const char *str, size_t count, void *unused)
+{
+        return str_nlength(str, count);
+}
+
+static int asprintf_wstr_write(const char32_t *str, size_t count, void *unused)
+{
+        return wstr_nlength(str, count);
+}
+
+int vprintf_length(const char *fmt, va_list args)
+{
+        printf_spec_t ps = {
+                asprintf_str_write,
+                asprintf_wstr_write,
+                NULL
+        };
+
+        return printf_core(fmt, &ps, args);
+}
+
+int printf_length(const char *fmt, ...)
+{
+        va_list args;
+        va_start(args, fmt);
+        int ret = vprintf_length(fmt, args);
+        va_end(args);
+
+        return ret;
+}
 
 /** Allocate and print to string.
@@ -58 +89 @@
         va_end(args2);
 
-        if (ret >= 0) {
+        if (ret > 0) {
                 *strp = malloc(ret + 1);
                 if (*strp == NULL)
@@ -84 +115 @@
         int ret = vasprintf(strp, fmt, args);
         va_end(args);
+
         return ret;
 }