Changeset dd2cfa7 in mainline for uspace/lib/libc/generic/string.c

Timestamp:

2009-08-02T22:11:28Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

19490ce

Parents:

fa5526d

Message:

Even more warnings.

File:

• uspace/lib/libc/generic/string.c (modified) (4 diffs)

uspace/lib/libc/generic/string.c

@@ -590 +590 @@
  * @return Pointer to character in @a str or NULL if not found.
  */
-const char *str_chr(const char *str, wchar_t ch)
+char *str_chr(const char *str, wchar_t ch)
 {
         wchar_t acc;
@@ -598 +598 @@
         while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
                 if (acc == ch)
-                        return (str + last);
+                        return (char *) (str + last);
                 last = off;
         }
@@ -612 +612 @@
  * @return Pointer to character in @a str or NULL if not found.
  */
-const char *str_rchr(const char *str, wchar_t ch)
+char *str_rchr(const char *str, wchar_t ch)
 {
         wchar_t acc;
@@ -625 +625 @@
         }
         
-        return res;
+        return (char *) res;
 }