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

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

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

@@ -76 +76 @@
  *             the newly allocated string.
  * @fmt        Format string.
+ * @args       Variable argument list
+ *
+ * @return Number of characters printed or a negative error code.
+ *
+ */
+int vasprintf(char **strp, const char *fmt, va_list args)
+{
+        va_list args2;
+        va_copy(args2, args);
+        int ret = vprintf_size(fmt, args2);
+        va_end(args2);
+        
+        if (ret > 0) {
+                *strp = malloc(STR_BOUNDS(ret) + 1);
+                if (*strp == NULL)
+                        return -1;
+                
+                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
+        }
+        
+        return ret;
+}
+
+/** Allocate and print to string.
+ *
+ * @param strp Address of the pointer where to store the address of
+ *             the newly allocated string.
+ * @fmt        Format string.
  *
  * @return Number of characters printed or a negative error code.
@@ -84 +112 @@
         va_list args;
         va_start(args, fmt);
-        int ret = vprintf_size(fmt, args);
+        int ret = vasprintf(strp, fmt, args);
         va_end(args);
-        
-        if (ret > 0) {
-                *strp = malloc(STR_BOUNDS(ret) + 1);
-                if (*strp == NULL)
-                        return -1;
-                
-                va_start(args, fmt);
-                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
-                va_end(args);
-        }
         
         return ret;