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

compositor-wayland: use asprintf for output title

Browse Source 
Simplifies the code, and makes moving weston_output_init() into
wayland_output_create_common() a little easier.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
This commit is contained in:
Pekka Paalanen
2017-08-11 15:55:32 +03:00
parent 1f21ef1df7
commit ffa42ffdaa
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-wayland.c
+7 -12
View File
@@ -1245,7 +1245,7 @@ static struct wayland_output *
wayland_output_create_common(const char *name) wayland_output_create_common(const char *name)
{ {
struct wayland_output *output; struct wayland_output *output;
size_t len; char *title;
/* name can't be NULL. */ /* name can't be NULL. */
assert(name); assert(name);
@@ -1256,22 +1256,17 @@ wayland_output_create_common(const char *name)
return NULL; return NULL;
} }
if (asprintf(&title, "%s - %s", WINDOW_TITLE, name) < 0) {
free(output);
return NULL;
}
output->title = title;
output->base.destroy = wayland_output_destroy; output->base.destroy = wayland_output_destroy;
output->base.disable = wayland_output_disable; output->base.disable = wayland_output_disable;
output->base.enable = wayland_output_enable; output->base.enable = wayland_output_enable;
output->base.name = strdup(name); output->base.name = strdup(name);
/* setup output name/title. */
len = strlen(WINDOW_TITLE " - ") + strlen(name) + 1;
output->title = zalloc(len);
if (!output->title) {
free(output->base.name);
free(output);
return NULL;
}
snprintf(output->title, len, WINDOW_TITLE " - %s", name);
return output; return output;
} }