Changeset 6843a9c in mainline for uspace/lib/c/include/str.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

uspace/lib/c/include/str.h

@@ -61 +61 @@
 extern size_t wstr_size(const wchar_t *str);
 
+extern size_t str_nsize(const char *str, size_t max_size);
+extern size_t wstr_nsize(const wchar_t *str, size_t max_size);
+
 extern size_t str_lsize(const char *str, size_t max_len);
 extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
@@ -91 +94 @@
 extern char *str_rchr(const char *str, wchar_t ch);
 
+extern void str_rtrim(char *str, wchar_t ch);
+extern void str_ltrim(char *str, wchar_t ch);
+
 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
 extern bool wstr_remove(wchar_t *str, size_t pos);
@@ -100 +106 @@
 extern int str_uint16_t(const char *, char **, unsigned int, bool, uint16_t *);
 extern int str_uint32_t(const char *, char **, unsigned int, bool, uint32_t *);
-extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
+extern int str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);