Changeset 132ab5d1 in mainline for uspace/lib/c/generic/str.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/lib/c/generic/str.c

@@ -37 +37 @@
 
 #include <str.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <assert.h>
-#include <stdint.h>
 #include <ctype.h>
-#include <malloc.h>
 #include <errno.h>
 #include <align.h>
@@ -919 +918 @@
  * @param src   Source utf16 string.
  *
- * @return EOK, if success, negative otherwise.
+ * @return EOK, if success, an error code otherwise.
  */
 int utf16_to_str(char *dest, size_t size, const uint16_t *src)
@@ -962 +961 @@
  * @param src   Source string.
  *
- * @return EOK, if success, negative otherwise.
+ * @return EOK, if success, an error code otherwise.
  */
 int str_to_utf16(uint16_t *dest, size_t dlen, const char *src)