Changeset 648e2ac in mainline


Ignore:
Timestamp:
2019-11-06T13:23:59Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
959b7ec
Parents:
b2d1df3
git-author:
Jiri Svoboda <jiri@…> (2019-10-03 18:23:56)
git-committer:
Jiri Svoboda <jiri@…> (2019-11-06 13:23:59)
Message:

ds_window_delete should be ds_window_destroy

Location:
uspace/srv/hid/display
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/display/display.c

    rb2d1df3 r648e2ac  
    8787        log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()");
    8888        ds_client_remove_window(wnd);
    89         ds_window_delete(wnd);
     89        ds_window_destroy(wnd);
    9090        return EOK;
    9191}

  • uspace/srv/hid/display/test/client.c

    rb2d1df3 r648e2ac  
    109109        PCUT_ASSERT_NULL(wnd);
    110110
    111         ds_window_delete(w0);
    112         ds_window_delete(w1);
     111        ds_window_destroy(w0);
     112        ds_window_destroy(w1);
    113113        ds_client_destroy(client);
    114114        ds_display_destroy(disp);
    … …  
    146146        PCUT_ASSERT_NULL(wnd);
    147147
    148         ds_window_delete(w0);
    149         ds_window_delete(w1);
     148        ds_window_destroy(w0);
     149        ds_window_destroy(w1);
    150150        ds_client_destroy(client);
    151151        ds_display_destroy(disp);
    … …  
    198198        PCUT_ASSERT_EQUALS(event.c, revent.kbd_event.c);
    199199
    200         ds_window_delete(wnd);
     200        ds_window_destroy(wnd);
    201201        ds_client_destroy(client);
    202202        ds_display_destroy(disp);

  • uspace/srv/hid/display/test/display.c

    rb2d1df3 r648e2ac  
    124124        PCUT_ASSERT_NULL(wnd);
    125125
    126         ds_window_delete(w0);
    127         ds_window_delete(w1);
     126        ds_window_destroy(w0);
     127        ds_window_destroy(w1);
    128128        ds_client_destroy(client);
    129129        ds_display_destroy(disp);
    … …  
    160160        PCUT_ASSERT_TRUE(called_cb);
    161161
    162         ds_window_delete(wnd);
     162        ds_window_destroy(wnd);
    163163        ds_client_destroy(client);
    164164        ds_display_destroy(disp);

  • uspace/srv/hid/display/test/window.c

    rb2d1df3 r648e2ac  
    6161        PCUT_ASSERT_NOT_NULL(gc);
    6262
    63         ds_window_delete(wnd);
     63        ds_window_destroy(wnd);
    6464        ds_client_destroy(client);
    6565        ds_display_destroy(disp);

  • uspace/srv/hid/display/window.c

    rb2d1df3 r648e2ac  
    220220 * @param wnd Window GC
    221221 */
    222 errno_t ds_window_delete(ds_window_t *wnd)
     222errno_t ds_window_destroy(ds_window_t *wnd)
    223223{
    224224        errno_t rc;

  • uspace/srv/hid/display/window.h

    rb2d1df3 r648e2ac  
    4747
    4848extern errno_t ds_window_create(ds_client_t *, ds_window_t **);
    49 extern errno_t ds_window_delete(ds_window_t *);
     49extern errno_t ds_window_destroy(ds_window_t *);
    5050extern gfx_context_t *ds_window_get_ctx(ds_window_t *);
    5151
Note: See TracChangeset for help on using the changeset viewer.