commit 974c0940603c1ee9487124ea96f94767d965910d
author Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fri Sep 05 14:45:09 2014 +0300
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fri Sep 05 14:45:09 2014 +0300
tree 02ebc9f0dca2aeacc1cde599a4e8008eae87570b
parent 052917aa2aa4f4e1a82d5316911a162c37af7bdc

fix asprintf warnings

Fix recently introduced compiler warnings:

desktop-shell/shell.c: In function 'shell_configuration':
desktop-shell/shell.c:588:10: warning: ignoring return value of
'asprintf', declared with attribute warn_unused_result [-Wunused-result]

src/screenshooter.c: In function ‘screenshooter_binding’:
src/screenshooter.c:291:10: warning: ignoring return value of
‘asprintf’, declared with attribute warn_unused_result [-Wunused-result]

src/text-backend.c: In function ‘text_backend_configuration’:
src/text-backend.c:944:10: warning: ignoring return value of ‘asprintf’,
declared with attribute warn_unused_result [-Wunused-result]

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

desktop-shell/shell.c

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 6103309..234849a 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -575,6 +575,7 @@
 	struct weston_config_section *section;
 	int duration;
 	char *s, *client;
+	int ret;
 
 	section = weston_config_get_section(shell->compositor->config,
 					    "screensaver", NULL, NULL);
@@ -585,8 +586,10 @@
 
 	section = weston_config_get_section(shell->compositor->config,
 					    "shell", NULL, NULL);
-	asprintf(&client, "%s/%s", weston_config_get_libexec_dir(),
-				   WESTON_SHELL_CLIENT);
+	ret = asprintf(&client, "%s/%s", weston_config_get_libexec_dir(),
+		       WESTON_SHELL_CLIENT);
+	if (ret < 0)
+		client = NULL;
 	weston_config_section_get_string(section,
 					 "client", &s, client);
 	free(client);

src/screenshooter.c

diff --git a/src/screenshooter.c b/src/screenshooter.c
index af2c754..cafbf10 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -287,9 +287,15 @@
 {
 	struct screenshooter *shooter = data;
 	char *screenshooter_exe;
+	int ret;
 
-	asprintf(&screenshooter_exe, "%s/%s", weston_config_get_libexec_dir(),
-					      "/weston-screenshooter");
+	ret = asprintf(&screenshooter_exe, "%s/%s",
+		       weston_config_get_libexec_dir(),
+		       "/weston-screenshooter");
+	if (ret < 0) {
+		weston_log("Could not construct screenshooter path.\n");
+		return;
+	}
 
 	if (!shooter->client)
 		shooter->client = weston_client_launch(shooter->ec,

src/text-backend.c

diff --git a/src/text-backend.c b/src/text-backend.c
index 7d2a064..e9578a4 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -938,11 +938,14 @@
 {
 	struct weston_config_section *section;
 	char *client;
+	int ret;
 
 	section = weston_config_get_section(text_backend->compositor->config,
 					    "input-method", NULL, NULL);
-	asprintf(&client, "%s/weston-keyboard",
-		 weston_config_get_libexec_dir());
+	ret = asprintf(&client, "%s/weston-keyboard",
+		       weston_config_get_libexec_dir());
+	if (ret < 0)
+		client = NULL;
 	weston_config_section_get_string(section, "path",
 					 &text_backend->input_method.path,
 					 client);