Changeset c7c6afd in mainline for uspace/lib/c/generic/io/asprintf.c

Timestamp:

2025-04-13T23:27:44Z (4 weeks ago)

Author:

GitHub <noreply@…>

Children:

b6061f8c

Parents:

240b2e4 (diff), f5e1692 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-13 23:27:44)

git-committer:

GitHub <noreply@…> (2025-04-13 23:27:44)

Message:

Merge branch 'HelenOS:master' into master

File:

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

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

@@ -40 +40 @@
 #include <str.h>
 #include <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.
@@ -115 +84 @@
         int ret = vasprintf(strp, fmt, args);
         va_end(args);
-
         return ret;
 }