Changeset 5a6cc679 in mainline for uspace/app/bdsh/compl.c


Ignore:
Timestamp:
2018-01-31T02:21:24Z (7 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/compl.c

    r132ab5d1 r5a6cc679  
    4040#include "tok.h"
    4141
    42 static int compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state);
    43 static int compl_get_next(void *state, char **compl);
     42static errno_t compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state);
     43static errno_t compl_get_next(void *state, char **compl);
    4444static void compl_fini(void *state);
    4545
    … …  
    8787 * Set up iterators in completion object, based on current token.
    8888 */
    89 static int compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state)
     89static errno_t compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state)
    9090{
    9191        compl_t *cs = NULL;
    … …  
    9393        char *prefix = NULL;
    9494        char *dirname = NULL;
    95         int retval;
     95        errno_t retval;
    9696       
    9797        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
    … …  
    288288
    289289/** Get next match. */
    290 static int compl_get_next(void *state, char **compl)
     290static errno_t compl_get_next(void *state, char **compl)
    291291{
    292292        compl_t *cs = (compl_t *) state;
Note: See TracChangeset for help on using the changeset viewer.