Changeset dd2cfa7 in mainline
- Timestamp:
- 2009-08-02T22:11:28Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 19490ce
- Parents:
- fa5526d
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/include/string.h
rfa5526d rdd2cfa7 89 89 extern void wstr_nstr(char *dst, const wchar_t *src, size_t size); 90 90 91 extern c onst char *str_chr(const char *str, wchar_t ch);91 extern char *str_chr(const char *str, wchar_t ch); 92 92 93 93 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); -
kernel/generic/src/lib/string.c
rfa5526d rdd2cfa7 638 638 * 639 639 */ 640 c onst char *str_chr(const char *str, wchar_t ch)640 char *str_chr(const char *str, wchar_t ch) 641 641 { 642 642 wchar_t acc; … … 646 646 while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { 647 647 if (acc == ch) 648 return ( str + last);648 return (char *) (str + last); 649 649 last = off; 650 650 } -
uspace/lib/libc/generic/string.c
rfa5526d rdd2cfa7 590 590 * @return Pointer to character in @a str or NULL if not found. 591 591 */ 592 c onst char *str_chr(const char *str, wchar_t ch)592 char *str_chr(const char *str, wchar_t ch) 593 593 { 594 594 wchar_t acc; … … 598 598 while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { 599 599 if (acc == ch) 600 return ( str + last);600 return (char *) (str + last); 601 601 last = off; 602 602 } … … 612 612 * @return Pointer to character in @a str or NULL if not found. 613 613 */ 614 c onst char *str_rchr(const char *str, wchar_t ch)614 char *str_rchr(const char *str, wchar_t ch) 615 615 { 616 616 wchar_t acc; … … 625 625 } 626 626 627 return res;627 return (char *) res; 628 628 } 629 629 -
uspace/lib/libc/include/string.h
rfa5526d rdd2cfa7 75 75 extern void wstr_nstr(char *dst, const wchar_t *src, size_t size); 76 76 77 extern c onst char *str_chr(const char *str, wchar_t ch);78 extern c onst char *str_rchr(const char *str, wchar_t ch);77 extern char *str_chr(const char *str, wchar_t ch); 78 extern char *str_rchr(const char *str, wchar_t ch); 79 79 80 80 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); -
uspace/srv/vfs/vfs_ops.c
rfa5526d rdd2cfa7 307 307 308 308 /* Check the offered options size. */ 309 if (size < 0 || size> MAX_MNTOPTS_LEN) {309 if (size > MAX_MNTOPTS_LEN) { 310 310 ipc_answer_0(callid, EINVAL); 311 311 ipc_answer_0(rid, EINVAL); … … 448 448 int mode = IPC_GET_ARG3(*request); 449 449 size_t len; 450 451 /* Ignore mode for now. */ 452 (void) mode; 450 453 451 454 /* … … 1053 1056 } 1054 1057 path[len] = '\0'; 1058 1059 /* Ignore mode for now. */ 1060 (void) mode; 1055 1061 1056 1062 fibril_rwlock_write_lock(&namespace_rwlock);
Note:
See TracChangeset
for help on using the changeset viewer.