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

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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.

Message:

merge mainline changes

File:

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

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

@@ -50 +50 @@
 }
 
+int vprintf_size(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_size(const char *fmt, ...)
+{
+        va_list args;
+        va_start(args, fmt);
+        int ret = vprintf_size(fmt, args);
+        va_end(args);
+        
+        return ret;
+}
+
 /** Allocate and print to string.
  *
@@ -61 +82 @@
 int asprintf(char **strp, const char *fmt, ...)
 {
-        printf_spec_t ps = {
-                asprintf_str_write,
-                asprintf_wstr_write,
-                NULL
-        };
-        
         va_list args;
         va_start(args, fmt);
-        
-        int ret = printf_core(fmt, &ps, args);
+        int ret = vprintf_size(fmt, args);
         va_end(args);