mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libweston: rename weston_output_destroy() to weston_output_release() 

'release' is a more appropriate name because the function does not free
the underlying memory. The main reason for this is that we need the name
weston_output_destroy() for new API that actually will free also the
underlying memory.

Since the function is only used in backends and external backends are
not a thing, this does not cause libweston major version bump, even
though it does change the ABI. There is no way external users could have
successfully used this function.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Acked-by Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen 2017-08-16 12:07:14 +03:00
parent 01e0068868
commit ae6d35db14
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libweston/compositor-drm.c
View File

@ -3272,7 +3272,7 @@ drm_output_destroy(struct weston_output *base)
if (output->pageflip_timer) if (output->pageflip_timer)
wl_event_source_remove(output->pageflip_timer); wl_event_source_remove(output->pageflip_timer);
weston_output_destroy(&output->base); weston_output_release(&output->base);
drm_property_info_free(output->props_conn, WDRM_CONNECTOR__COUNT); drm_property_info_free(output->props_conn, WDRM_CONNECTOR__COUNT);

2
libweston/compositor-fbdev.c
View File

@ -555,7 +555,7 @@ fbdev_output_destroy(struct weston_output *base)
fbdev_output_disable_handler(base); fbdev_output_disable_handler(base);
/* Remove the output. */ /* Remove the output. */
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output->device); free(output->device);
free(output); free(output);

2
libweston/compositor-headless.c
View File

@ -134,7 +134,7 @@ headless_output_destroy(struct weston_output *base)
struct headless_output *output = to_headless_output(base); struct headless_output *output = to_headless_output(base);
headless_output_disable(&output->base); headless_output_disable(&output->base);
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output); free(output);
} }

4
libweston/compositor-rdp.c
View File

@ -570,7 +570,7 @@ rdp_output_destroy(struct weston_output *base)
struct rdp_output *output = to_rdp_output(base); struct rdp_output *output = to_rdp_output(base);
rdp_output_disable(&output->base); rdp_output_disable(&output->base);
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output); free(output);
} }
@ -1360,7 +1360,7 @@ rdp_backend_create(struct weston_compositor *compositor,
err_listener: err_listener:
freerdp_listener_free(b->listener); freerdp_listener_free(b->listener);
err_output: err_output:
weston_output_destroy(&b->output->base); weston_output_release(&b->output->base);
err_compositor: err_compositor:
weston_compositor_shutdown(compositor); weston_compositor_shutdown(compositor);
err_free_strings: err_free_strings:

6
libweston/compositor-wayland.c
View File

@ -703,7 +703,7 @@ wayland_output_destroy(struct weston_output *base)
wayland_output_disable(&output->base); wayland_output_disable(&output->base);
weston_output_destroy(&output->base); weston_output_release(&output->base);
if (output->frame_cb) if (output->frame_cb)
wl_callback_destroy(output->frame_cb); wl_callback_destroy(output->frame_cb);
@ -1376,7 +1376,7 @@ wayland_output_create_for_parent_output(struct wayland_backend *b,
return 0; return 0;
out: out:
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output->title); free(output->title);
free(output); free(output);
@ -1424,7 +1424,7 @@ wayland_output_create_fullscreen(struct wayland_backend *b)
err_set_size: err_set_size:
wayland_backend_destroy_output_surface(output); wayland_backend_destroy_output_surface(output);
err_surface: err_surface:
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output->title); free(output->title);
free(output); free(output);

2
libweston/compositor-x11.c
View File

@ -801,7 +801,7 @@ x11_output_destroy(struct weston_output *base)
struct x11_output *output = to_x11_output(base); struct x11_output *output = to_x11_output(base);
x11_output_disable(&output->base); x11_output_disable(&output->base);
weston_output_destroy(&output->base); weston_output_release(&output->base);
free(output); free(output);
} }

4
libweston/compositor.c
View File

@ -4750,7 +4750,7 @@ weston_output_init(struct weston_output *output,
* Also notifies the compositor that an output is pending for * Also notifies the compositor that an output is pending for
* configuration. * configuration.
* *
* The opposite of this operation is built into weston_output_destroy(). * The opposite of this operation is built into weston_output_release().
* *
* \memberof weston_output * \memberof weston_output
* \internal * \internal
@ -4931,7 +4931,7 @@ weston_pending_output_coldplug(struct weston_compositor *compositor)
* \internal * \internal
*/ */
WL_EXPORT void WL_EXPORT void
weston_output_destroy(struct weston_output *output) weston_output_release(struct weston_output *output)
{ {
output->destroying = 1; output->destroying = 1;

2
libweston/compositor.h
View File

@ -1717,7 +1717,7 @@ void
weston_output_move(struct weston_output *output, int x, int y); weston_output_move(struct weston_output *output, int x, int y);
void void
weston_output_destroy(struct weston_output *output); weston_output_release(struct weston_output *output);
void void
weston_output_transform_coordinate(struct weston_output *output, weston_output_transform_coordinate(struct weston_output *output,
double device_x, double device_y, double device_x, double device_y,