Changeset dd2cfa7 in mainline for uspace

Timestamp:

2009-08-02T22:11:28Z (16 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.

Location:

uspace

Files:

• lib/libc/generic/string.c (modified) (4 diffs)
• lib/libc/include/string.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (3 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;
 }
 

uspace/lib/libc/include/string.h

@@ -75 +75 @@
 extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
 
-extern const char *str_chr(const char *str, wchar_t ch);
-extern const char *str_rchr(const char *str, wchar_t ch);
+extern char *str_chr(const char *str, wchar_t ch);
+extern char *str_rchr(const char *str, wchar_t ch);
 
 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);

uspace/srv/vfs/vfs_ops.c

@@ -307 +307 @@
 
         /* Check the offered options size. */
-        if (size < 0 || size > MAX_MNTOPTS_LEN) {
+        if (size > MAX_MNTOPTS_LEN) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -448 +448 @@
         int mode = IPC_GET_ARG3(*request);
         size_t len;
+
+        /* Ignore mode for now. */
+        (void) mode;
         
         /*
@@ -1053 +1056 @@
         }
         path[len] = '\0';
+
+        /* Ignore mode for now. */
+        (void) mode;
         
         fibril_rwlock_write_lock(&namespace_rwlock);