Changeset 05c9d92 in mainline


Ignore:
Timestamp:
2026-03-18T08:05:24Z (29 hours ago)
Author:
Vít Skalický <skalicky@…>
Children:
34832c3
Parents:
4a0bfcf0 (diff), 222774a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into vitSkalicky/cmpdirs

Location:
uspace
Files:
2 added
24 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/calculator/calculator.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * Copyright (c) 2016 Martin Decky
    44 * All rights reserved.
    … …  
    3737 */
    3838
     39#include <adt/list.h>
    3940#include <clipboard.h>
    4041#include <ctype.h>

  • uspace/app/gfxdemo/gfxdemo.c

    r4a0bfcf0 r05c9d92  
    3636#include <display.h>
    3737#include <fibril.h>
     38#include <fibril_synch.h>
    3839#include <gfx/bitmap.h>
    3940#include <gfx/color.h>

  • uspace/app/nav/copy.c

    r4a0bfcf0 r05c9d92  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/nav/delete.c

    r4a0bfcf0 r05c9d92  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/nav/dlg/copydlg.c

    r4a0bfcf0 r05c9d92  
    3838#include <mem.h>
    3939#include <stdbool.h>
     40#include <stdio.h>
    4041#include <stdlib.h>
    4142#include <ui/fixed.h>

  • uspace/app/nav/dlg/deletedlg.c

    r4a0bfcf0 r05c9d92  
    3838#include <mem.h>
    3939#include <stdbool.h>
     40#include <stdio.h>
    4041#include <stdlib.h>
    4142#include <ui/fixed.h>

  • uspace/app/nav/dlg/movedlg.c

    r4a0bfcf0 r05c9d92  
    3838#include <mem.h>
    3939#include <stdbool.h>
     40#include <stdio.h>
    4041#include <stdlib.h>
    4142#include <ui/fixed.h>

  • uspace/app/nav/dlg/progress.c

    r4a0bfcf0 r05c9d92  
    3737#include <fmgt.h>
    3838#include <mem.h>
     39#include <stdio.h>
    3940#include <stdlib.h>
    4041#include <ui/fixed.h>

  • uspace/app/nav/dlg/renamedlg.c

    r4a0bfcf0 r05c9d92  
    3838#include <mem.h>
    3939#include <stdbool.h>
     40#include <stdio.h>
    4041#include <stdlib.h>
    4142#include <str.h>

  • uspace/app/nav/dlg/verifydlg.c

    r4a0bfcf0 r05c9d92  
    3838#include <mem.h>
    3939#include <stdbool.h>
     40#include <stdio.h>
    4041#include <stdlib.h>
    4142#include <ui/fixed.h>

  • uspace/app/nav/move.c

    r4a0bfcf0 r05c9d92  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/nav/newdir.c

    r4a0bfcf0 r05c9d92  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/nav/newfile.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2025 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3636#include <capa.h>
    3737#include <fmgt.h>
     38#include <stdio.h>
    3839#include <stdlib.h>
    3940#include <str_error.h>

  • uspace/app/nav/rename.c

    r4a0bfcf0 r05c9d92  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/nav/verify.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2025 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3535
    3636#include <fmgt.h>
     37#include <stdio.h>
    3738#include <stdlib.h>
    3839#include <str_error.h>

  • uspace/app/taskbar/tbsmenu.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3636#include <stdbool.h>
    3737#include <stddef.h>
     38#include <stdio.h>
    3839#include <stdlib.h>
    3940#include <str.h>

  • uspace/lib/console/include/io/console.h

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4242#include <io/cons_event.h>
    4343#include <io/keycode.h>
    44 #include <async.h>
    4544#include <stdbool.h>
    4645#include <stdio.h>
    47 
    48 /** Console control structure. */
    49 typedef struct {
    50         /** Console input file */
    51         FILE *input;
    52 
    53         /** Console output file */
    54         FILE *output;
    55 
    56         /** Console input session */
    57         async_sess_t *input_sess;
    58 
    59         /** Console output session */
    60         async_sess_t *output_sess;
    61 
    62         /** Input request call with timeout */
    63         ipc_call_t input_call;
    64 
    65         /** Input response with timeout */
    66         aid_t input_aid;
    67 } console_ctrl_t;
     46#include <types/console.h>
    6847
    6948extern console_ctrl_t *console_init(FILE *, FILE *);

  • uspace/lib/console/src/console.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * Copyright (c) 2006 Josef Cejka
    44 * Copyright (c) 2006 Jakub Vana
    … …  
    4545#include <io/console.h>
    4646#include <ipc/console.h>
     47#include "../private/console.h"
    4748
    4849console_ctrl_t *console_init(FILE *ifile, FILE *ofile)

  • uspace/lib/display/include/types/display.h

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3636#define _LIBDISPLAY_TYPES_DISPLAY_H_
    3737
    38 #include <async.h>
    39 #include <fibril_synch.h>
    4038#include <io/kbd_event.h>
    4139#include <io/pos_event.h>

  • uspace/lib/fmgt/test/fsops.c

    r4a0bfcf0 r05c9d92  
    216216        char buf[L_tmpnam];
    217217        char dbuffer[64];
    218         char data[3] = "XYZ";
     218        char data[4] = "XYZ";
    219219        FILE *f;
    220220        char *p;
    … …  
    239239        rc = fmgt_write(fmgt, fd, p, &pos, data, sizeof(data));
    240240        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
    241         PCUT_ASSERT_INT_EQUALS(pos, 3);
     241        PCUT_ASSERT_INT_EQUALS(pos, 4);
    242242
    243243        fmgt_destroy(fmgt);
    … …  
    248248
    249249        nr = fread(dbuffer, 1, sizeof(dbuffer), f);
    250         PCUT_ASSERT_INT_EQUALS(nr, 3);
     250        PCUT_ASSERT_INT_EQUALS(nr, 4);
    251251        (void)fclose(f);
    252252

  • uspace/lib/ui/include/ui/ui.h

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2022 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4040#include <errno.h>
    4141#include <gfx/coord.h>
    42 #include <io/console.h>
    4342#include <stdbool.h>
     43#include <types/console.h>
    4444#include <types/ui/clickmatic.h>
    4545#include <types/ui/ui.h>

  • uspace/lib/ui/src/entry.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2021 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3737 */
    3838
     39#include <assert.h>
    3940#include <clipboard.h>
    4041#include <errno.h>
    … …  
    4445#include <gfx/text.h>
    4546#include <macros.h>
     47#include <stdio.h>
    4648#include <stdlib.h>
    4749#include <str.h>

  • uspace/lib/ui/src/msgdialog.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2025 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3434 */
    3535
     36#include <assert.h>
    3637#include <errno.h>
    3738#include <mem.h>

  • uspace/lib/ui/test/menudd.c

    r4a0bfcf0 r05c9d92  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2026 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3232#include <pcut/pcut.h>
    3333#include <stdbool.h>
     34#include <stdio.h>
    3435#include <str.h>
    3536#include <ui/control.h>
Note: See TracChangeset for help on using the changeset viewer.