Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset dd2cfa7 in mainline


Ignore:
Timestamp:
2009-08-02T22:11:28Z (12 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master
Children:
19490ce
Parents:
fa5526d
Message:

Even more warnings.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/string.h

    rfa5526d rdd2cfa7  
    8989extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
    9090
    91 extern const char *str_chr(const char *str, wchar_t ch);
     91extern char *str_chr(const char *str, wchar_t ch);
    9292
    9393extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
  • kernel/generic/src/lib/string.c

    rfa5526d rdd2cfa7  
    638638 *
    639639 */
    640 const char *str_chr(const char *str, wchar_t ch)
     640char *str_chr(const char *str, wchar_t ch)
    641641{
    642642        wchar_t acc;
     
    646646        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
    647647                if (acc == ch)
    648                         return (str + last);
     648                        return (char *) (str + last);
    649649                last = off;
    650650        }
  • uspace/lib/libc/generic/string.c

    rfa5526d rdd2cfa7  
    590590 * @return Pointer to character in @a str or NULL if not found.
    591591 */
    592 const char *str_chr(const char *str, wchar_t ch)
     592char *str_chr(const char *str, wchar_t ch)
    593593{
    594594        wchar_t acc;
     
    598598        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
    599599                if (acc == ch)
    600                         return (str + last);
     600                        return (char *) (str + last);
    601601                last = off;
    602602        }
     
    612612 * @return Pointer to character in @a str or NULL if not found.
    613613 */
    614 const char *str_rchr(const char *str, wchar_t ch)
     614char *str_rchr(const char *str, wchar_t ch)
    615615{
    616616        wchar_t acc;
     
    625625        }
    626626       
    627         return res;
     627        return (char *) res;
    628628}
    629629
  • uspace/lib/libc/include/string.h

    rfa5526d rdd2cfa7  
    7575extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
    7676
    77 extern const char *str_chr(const char *str, wchar_t ch);
    78 extern const char *str_rchr(const char *str, wchar_t ch);
     77extern char *str_chr(const char *str, wchar_t ch);
     78extern char *str_rchr(const char *str, wchar_t ch);
    7979
    8080extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
  • uspace/srv/vfs/vfs_ops.c

    rfa5526d rdd2cfa7  
    307307
    308308        /* Check the offered options size. */
    309         if (size < 0 || size > MAX_MNTOPTS_LEN) {
     309        if (size > MAX_MNTOPTS_LEN) {
    310310                ipc_answer_0(callid, EINVAL);
    311311                ipc_answer_0(rid, EINVAL);
     
    448448        int mode = IPC_GET_ARG3(*request);
    449449        size_t len;
     450
     451        /* Ignore mode for now. */
     452        (void) mode;
    450453       
    451454        /*
     
    10531056        }
    10541057        path[len] = '\0';
     1058
     1059        /* Ignore mode for now. */
     1060        (void) mode;
    10551061       
    10561062        fibril_rwlock_write_lock(&namespace_rwlock);
Note: See TracChangeset for help on using the changeset viewer.