Changeset 04803bf in mainline for kernel/generic/include/str.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/include/str.h (moved) (moved from kernel/generic/include/string.h ) (3 diffs)

kernel/generic/include/str.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_STRING_H_
-#define KERN_STRING_H_
+#ifndef KERN_STR_H_
+#define KERN_STR_H_
 
 #include <typedefs.h>
@@ -87 +87 @@
 extern void str_cpy(char *dest, size_t size, const char *src);
 extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
-extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
+extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
+
+extern char *str_dup(const char *src);
+extern char *str_ndup(const char *src, size_t n);
 
 extern char *str_chr(const char *str, wchar_t ch);
@@ -94 +97 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
+extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
+
+extern void order_suffix(const uint64_t val, uint64_t *rv, char *suffix);
+
 #endif