Changeset 2e839dda in mainline

Timestamp:

2011-06-27T16:35:11Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

7194a60

Parents:

61e29a4d

Message:

New functions for string library:

1. Lookup for character in wide string

wstr_chr
wstr_rchr

2. Convert size_t to string: size_t_str
3. Reverse string: str_reverse

Location:

uspace/lib/c

Files:

• generic/str.c (modified) (2 diffs)
• include/str.h (modified) (2 diffs)

uspace/lib/c/generic/str.c

@@ -722 +722 @@
 }
 
+/** Find first occurence of character in wide string.
+ *
+ * @param wstr String to search.
+ * @param ch  Character to look for.
+ *
+ * @return Pointer to character in @a wstr or NULL if not found.
+ */
+wchar_t *wstr_chr(const wchar_t *wstr, wchar_t ch)
+{
+        while (*wstr && *wstr != ch)
+                wstr++;
+        if (*wstr)
+                return (wchar_t *) wstr;
+        else
+                return NULL;
+}
+
+/** Find last occurence of character in wide string.
+ *
+ * @param wstr String to search.
+ * @param ch  Character to look for.
+ *
+ * @return Pointer to character in @a wstr or NULL if not found.
+ */
+wchar_t *wstr_rchr(const wchar_t *wstr, wchar_t ch)
+{
+        const wchar_t *res = NULL;
+        while (*wstr) {
+                if (*wstr == ch)
+                        res = wstr;
+                wstr++;
+        }
+        return (wchar_t *) res;
+}
+
 /** Insert a wide character into a wide string.
  *
@@ -974 +1009 @@
 }
 
+void str_reverse(char* begin, char* end) 
+{
+    char aux;
+    while(end>begin)
+        aux=*end, *end--=*begin, *begin++=aux;
+}
+
+int size_t_str(size_t value, int base, char* str, size_t size) 
+{
+    static char num[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+    char* wstr=str;
+        
+        if (size == 0) 
+                return EINVAL;
+    if (base<2 || base>35) {
+        *str='\0';
+        return EINVAL;
+    }
+
+    do {
+        *wstr++ = num[value % base];
+                if (--size == 0)
+                        return EOVERFLOW;
+    } while(value /= base);
+    *wstr='\0';
+
+    // Reverse string
+    str_reverse(str,wstr-1);
+        return EOK;
+}
 
 /** Convert initial part of string to unsigned long according to given base.

uspace/lib/c/include/str.h

@@ -80 +80 @@
 extern char *str_chr(const char *str, wchar_t ch);
 extern char *str_rchr(const char *str, wchar_t ch);
+extern wchar_t *wstr_chr(const wchar_t *wstr, wchar_t ch);
+extern wchar_t *wstr_rchr(const wchar_t *wstr, wchar_t ch);
 
 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
@@ -86 +88 @@
 extern char *str_dup(const char *);
 extern char *str_ndup(const char *, size_t max_size);
+
+extern void str_reverse(char* begin, char* end);
+extern int size_t_str(size_t value, int base, char* str, size_t size);
 
 extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);