Changeset 5a6cc679 in mainline for uspace/app/sbi/src/input.c


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 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/sbi/src/input.c

    r132ab5d1 r5a6cc679  
    4545#define INPUT_BUFFER_SIZE 256
    4646
    47 static int input_init_file(input_t *input, const char *fname);
     47static errno_t input_init_file(input_t *input, const char *fname);
    4848static void input_init_interactive(input_t *input);
    4949static void input_init_string(input_t *input, const char *str);
     
    5757 *                      ENOENT when opening file fails.
    5858 */
    59 int input_new_file(input_t **input, const char *fname)
     59errno_t input_new_file(input_t **input, const char *fname)
    6060{
    6161        *input = malloc(sizeof(input_t));
     
    7171 * @return              EOK on success, ENOMEM when allocation fails.
    7272 */
    73 int input_new_interactive(input_t **input)
     73errno_t input_new_interactive(input_t **input)
    7474{
    7575        *input = malloc(sizeof(input_t));
     
    8787 * @return              EOK on success, ENOMEM when allocation fails.
    8888 */
    89 int input_new_string(input_t **input, const char *str)
     89errno_t input_new_string(input_t **input, const char *str)
    9090{
    9191        *input = malloc(sizeof(input_t));
     
    104104 * @return              EOK on success, ENOENT when opening file fails.
    105105*/
    106 static int input_init_file(input_t *input, const char *fname)
     106static errno_t input_init_file(input_t *input, const char *fname)
    107107{
    108108        FILE *f;
     
    174174 * @return              EOK on success, EIO on failure.
    175175 */
    176 int input_get_line(input_t *input, char **line)
     176errno_t input_get_line(input_t *input, char **line)
    177177{
    178178        const char *prompt;
Note: See TracChangeset for help on using the changeset viewer.