Changeset 4f4018b in mainline

Timestamp:

2019-02-05T15:25:50Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

cca2d93b

Parents:

472fe7a

Message:

Do not misuse printf_size() to estimate byte size of output

The incorrectly named function actually counts unicode code
points.

Location:

uspace/lib

Files:

• c/generic/io/asprintf.c (modified) (1 diff)
• http/src/headers.c (modified) (1 diff)
• http/src/request.c (modified) (1 diff)

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

@@ -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);
         }
 

uspace/lib/http/src/headers.c

@@ -85 +85 @@
 {
         /* TODO properly split long header values */
-        if (buf == NULL) {
-                return printf_size(HTTP_HEADER_LINE, header->name, header->value);
-        } else {
-                return snprintf(buf, buf_size,
-                    HTTP_HEADER_LINE, header->name, header->value);
-        }
+        return snprintf(buf, buf_size,
+            HTTP_HEADER_LINE, header->name, header->value);
 }
 

uspace/lib/http/src/request.c

@@ -82 +82 @@
     const char *method, const char *path)
 {
-        if (buf == NULL) {
-                return printf_size(HTTP_METHOD_LINE, method, path);
-        } else {
-                return snprintf(buf, buf_size, HTTP_METHOD_LINE, method, path);
-        }
+        return snprintf(buf, buf_size, HTTP_METHOD_LINE, method, path);
 }