mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: fix spacing and lines wraping

Browse Source 
Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: squashed with "compositor-wayland: fix too long lines".]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Benoit Gschwind
2016-05-10 22:47:44 +02:00
committed by Pekka Paalanen
parent 1c0e40d9a2
commit 676841d617
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-wayland.c
+12 -7
View File
@@ -2326,8 +2326,10 @@ wayland_backend_destroy(struct wayland_backend *b)
} }
static void static void
wayland_backend_config_release(struct weston_wayland_backend_config *new_config) { wayland_backend_config_release(struct weston_wayland_backend_config *new_config)
{
int i; int i;
for (i = 0; i < new_config->num_outputs; ++i) { for (i = 0; i < new_config->num_outputs; ++i) {
free(new_config->outputs[i].name); free(new_config->outputs[i].name);
} }
@@ -2342,21 +2344,24 @@ wayland_backend_config_release(struct weston_wayland_backend_config *new_config)
* structure is NOT cleared nor set to default values. * structure is NOT cleared nor set to default values.
*/ */
static struct weston_wayland_backend_output_config * static struct weston_wayland_backend_output_config *
wayland_backend_config_add_new_output(struct weston_wayland_backend_config *new_config) { wayland_backend_config_add_new_output(struct weston_wayland_backend_config *new_config)
{
struct weston_wayland_backend_output_config *outputs; struct weston_wayland_backend_output_config *outputs;
const size_t element_size = sizeof(struct weston_wayland_backend_output_config);
outputs = realloc(new_config->outputs, outputs = realloc(new_config->outputs,
(new_config->num_outputs+1)*sizeof(struct weston_wayland_backend_output_config)); (new_config->num_outputs + 1) * element_size);
if (!outputs) if (!outputs)
return NULL; return NULL;
new_config->num_outputs += 1; new_config->num_outputs += 1;
new_config->outputs = outputs; new_config->outputs = outputs;
return &(new_config->outputs[new_config->num_outputs-1]); return &(new_config->outputs[new_config->num_outputs - 1]);
} }
static int static int
load_wayland_backend_config(struct weston_compositor *compositor, int *argc, char *argv[], load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
struct weston_config *config, char *argv[], struct weston_config *config,
struct weston_wayland_backend_config *out_config) struct weston_wayland_backend_config *out_config)
{ {
struct weston_wayland_backend_config new_config = { 0, }; struct weston_wayland_backend_config new_config = { 0, };
struct weston_config_section *section; struct weston_config_section *section;