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

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

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

@@ -51 +51 @@
 }
 
-int vprintf_size(const char *fmt, va_list args)
+int vprintf_length(const char *fmt, va_list args)
 {
         printf_spec_t ps = {
@@ -62 +62 @@
 }
 
-int printf_size(const char *fmt, ...)
+int printf_length(const char *fmt, ...)
 {
         va_list args;
         va_start(args, fmt);
-        int ret = vprintf_size(fmt, args);
+        int ret = vprintf_length(fmt, args);
         va_end(args);
 
@@ -86 +86 @@
         va_list args2;
         va_copy(args2, args);
-        int ret = vprintf_size(fmt, args2);
+        int ret = vsnprintf(NULL, 0, fmt, args2);
         va_end(args2);
 
         if (ret > 0) {
-                *strp = malloc(STR_BOUNDS(ret) + 1);
+                *strp = malloc(ret + 1);
                 if (*strp == NULL)
                         return -1;
 
-                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
+                vsnprintf(*strp, ret + 1, fmt, args);
         }