hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-29 16:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

impl->destroy cleanup:

Browse source 
- remove trivial destroy() function
 - make sure we check impl and impl->destroy before calling
 - always call free if not implemented
This commit is contained in:
Dominique Martinet 2017-08-14 16:16:20 +02:00
parent ba20d5b3ca
commit 4bbf718e7d
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/backend.c
View file

@ -32,8 +32,10 @@ bool wlr_backend_start(struct wlr_backend *backend) {
} }
void wlr_backend_destroy(struct wlr_backend *backend) { void wlr_backend_destroy(struct wlr_backend *backend) {
if (backend->impl->destroy) { if (backend->impl && backend->impl->destroy) {
backend->impl->destroy(backend); backend->impl->destroy(backend);
} else {
free(backend);
} }
} }

2
backend/wayland/output.c
View file

@ -103,7 +103,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
struct wlr_wl_backend_output *output; struct wlr_wl_backend_output *output;
if (!(output = calloc(sizeof(struct wlr_wl_backend_output), 1))) { if (!(output = calloc(sizeof(struct wlr_wl_backend_output), 1))) {
wlr_log(L_ERROR, "Failed to allocate wlr_output_state"); wlr_log(L_ERROR, "Failed to allocate wlr_wl_backend_output");
return NULL; return NULL;
} }
wlr_output_init(&output->wlr_output, &output_impl); wlr_output_init(&output->wlr_output, &output_impl);

5
render/gles2/renderer.c
View file

@ -227,10 +227,6 @@ static bool wlr_gles2_buffer_is_drm(struct wlr_renderer *_renderer,
EGL_TEXTURE_FORMAT, &format); EGL_TEXTURE_FORMAT, &format);
} }
static void wlr_gles2_destroy(struct wlr_renderer *renderer) {
free(renderer);
}
static struct wlr_renderer_impl wlr_renderer_impl = { static struct wlr_renderer_impl wlr_renderer_impl = {
.begin = wlr_gles2_begin, .begin = wlr_gles2_begin,
.end = wlr_gles2_end, .end = wlr_gles2_end,
@ -240,7 +236,6 @@ static struct wlr_renderer_impl wlr_renderer_impl = {
.render_ellipse = wlr_gles2_render_ellipse, .render_ellipse = wlr_gles2_render_ellipse,
.formats = wlr_gles2_formats, .formats = wlr_gles2_formats,
.buffer_is_drm = wlr_gles2_buffer_is_drm, .buffer_is_drm = wlr_gles2_buffer_is_drm,
.destroy = wlr_gles2_destroy
}; };
struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend) { struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend) {

4
render/wlr_renderer.c
View file

@ -8,8 +8,10 @@ void wlr_renderer_init(struct wlr_renderer *renderer,
} }
void wlr_renderer_destroy(struct wlr_renderer *r) { void wlr_renderer_destroy(struct wlr_renderer *r) {
if (r && r->impl->destroy) { if (r && r->impl && r->impl->destroy) {
r->impl->destroy(r); r->impl->destroy(r);
} else {
free(r);
} }
} }

4
render/wlr_texture.c
View file

@ -9,8 +9,10 @@ void wlr_texture_init(struct wlr_texture *texture,
} }
void wlr_texture_destroy(struct wlr_texture *texture) { void wlr_texture_destroy(struct wlr_texture *texture) {
if (texture && texture->impl->destroy) { if (texture && texture->impl && texture->impl->destroy) {
texture->impl->destroy(texture); texture->impl->destroy(texture);
} else {
free(texture);
} }
} }

2
types/wlr_output.c
View file

@ -183,7 +183,7 @@ void wlr_output_destroy(struct wlr_output *output) {
free(mode); free(mode);
} }
list_free(output->modes); list_free(output->modes);
if (output->impl->destroy) { if (output->impl && output->impl->destroy) {
output->impl->destroy(output); output->impl->destroy(output);
} else { } else {
free(output); free(output);