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

pipewire,remoting,tests: Replace asprintf w/ str_printf

Browse Source 
We have a string helper which wraps asprintf(). Uses that one because it
clears out the destination string, but also it won't return the number
of bytes unlinke asprintf().

Fixes warnings like:
warning: ignoring return value of ‘asprintf’ declared with attribute
‘warn_unused_result’.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad
2022-03-08 15:30:04 +02:00
parent 3e94836a63
commit d284ab0322
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipewire/pipewire-plugin.c
+2 -1
View File
@@ -29,6 +29,7 @@
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "shared/string-helpers.h"
#include <libweston/backend-drm.h> #include <libweston/backend-drm.h>
#include <libweston/weston-log.h> #include <libweston/weston-log.h>
@@ -550,7 +551,7 @@ pipewire_output_create(struct weston_compositor *c, char *name)
output->pipewire = pipewire; output->pipewire = pipewire;
wl_list_insert(pipewire->output_list.prev, &output->link); wl_list_insert(pipewire->output_list.prev, &output->link);
asprintf(&remoting_name, "%s-%s", connector_name, name); str_printf(&remoting_name, "%s-%s", connector_name, name);
weston_head_init(head, remoting_name); weston_head_init(head, remoting_name);
weston_head_set_subpixel(head, WL_OUTPUT_SUBPIXEL_NONE); weston_head_set_subpixel(head, WL_OUTPUT_SUBPIXEL_NONE);
weston_head_set_monitor_strings(head, make, model, serial_number); weston_head_set_monitor_strings(head, make, model, serial_number);
remoting/remoting-plugin.c
+2 -1
View File
@@ -47,6 +47,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "shared/weston-drm-fourcc.h" #include "shared/weston-drm-fourcc.h"
#include "shared/string-helpers.h"
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
@@ -777,7 +778,7 @@ remoting_output_create(struct weston_compositor *c, char *name)
output->remoting = remoting; output->remoting = remoting;
wl_list_insert(remoting->output_list.prev, &output->link); wl_list_insert(remoting->output_list.prev, &output->link);
asprintf(&remoting_name, "%s-%s", connector_name, name); str_printf(&remoting_name, "%s-%s", connector_name, name);
weston_head_init(head, remoting_name); weston_head_init(head, remoting_name);
weston_head_set_subpixel(head, WL_OUTPUT_SUBPIXEL_NONE); weston_head_set_subpixel(head, WL_OUTPUT_SUBPIXEL_NONE);
weston_head_set_monitor_strings(head, make, model, serial_number); weston_head_set_monitor_strings(head, make, model, serial_number);
tests/weston-test-fixture-compositor.c
+20 -17
View File
@@ -38,6 +38,7 @@
#include <fcntl.h> #include <fcntl.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/string-helpers.h"
#include "weston-test-fixture-compositor.h" #include "weston-test-fixture-compositor.h"
#include "weston.h" #include "weston.h"
#include "test-config.h" #include "test-config.h"
@@ -116,7 +117,8 @@ get_lock_path(void)
return NULL; return NULL;
} }
if (asprintf(&lock_path, "%s/%s", env_path, suffix) == -1) str_printf(&lock_path, "%s/%s", env_path, suffix);
if (!lock_path)
return NULL; return NULL;
return lock_path; return lock_path;
@@ -345,10 +347,10 @@ execute_compositor(const struct compositor_setup *setup,
prog_args_init(&args); prog_args_init(&args);
/* argv[0] */ /* argv[0] */
asprintf(&tmp, "weston-%s", setup->testset_name); str_printf(&tmp, "weston-%s", setup->testset_name);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
asprintf(&tmp, "--backend=%s", backend_to_str(setup->backend)); str_printf(&tmp, "--backend=%s", backend_to_str(setup->backend));
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
if (setup->backend == WESTON_BACKEND_DRM) { if (setup->backend == WESTON_BACKEND_DRM) {
@@ -362,7 +364,7 @@ execute_compositor(const struct compositor_setup *setup,
ret = RESULT_SKIP; ret = RESULT_SKIP;
goto out; goto out;
} }
asprintf(&tmp, "--drm-device=%s", drm_device); str_printf(&tmp, "--drm-device=%s", drm_device);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
prog_args_take(&args, strdup("--seat=weston-test-seat")); prog_args_take(&args, strdup("--seat=weston-test-seat"));
@@ -379,36 +381,36 @@ execute_compositor(const struct compositor_setup *setup,
/* Test suite needs the debug protocol to be able to take screenshots */ /* Test suite needs the debug protocol to be able to take screenshots */
prog_args_take(&args, strdup("--debug")); prog_args_take(&args, strdup("--debug"));
asprintf(&tmp, "--socket=%s", setup->testset_name); str_printf(&tmp, "--socket=%s", setup->testset_name);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
asprintf(&tmp, "--modules=%s%s%s", TESTSUITE_PLUGIN_PATH, str_printf(&tmp, "--modules=%s%s%s", TESTSUITE_PLUGIN_PATH,
setup->extra_module ? "," : "", setup->extra_module ? "," : "",
setup->extra_module ? setup->extra_module : ""); setup->extra_module ? setup->extra_module : "");
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
if (setup->backend != WESTON_BACKEND_DRM && if (setup->backend != WESTON_BACKEND_DRM &&
setup->backend != WESTON_BACKEND_FBDEV) { setup->backend != WESTON_BACKEND_FBDEV) {
asprintf(&tmp, "--width=%d", setup->width); str_printf(&tmp, "--width=%d", setup->width);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
asprintf(&tmp, "--height=%d", setup->height); str_printf(&tmp, "--height=%d", setup->height);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
} }
if (setup->scale != 1) { if (setup->scale != 1) {
asprintf(&tmp, "--scale=%d", setup->scale); str_printf(&tmp, "--scale=%d", setup->scale);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
} }
if (setup->transform != WL_OUTPUT_TRANSFORM_NORMAL) { if (setup->transform != WL_OUTPUT_TRANSFORM_NORMAL) {
asprintf(&tmp, "--transform=%s", str_printf(&tmp, "--transform=%s",
transform_to_str(setup->transform)); transform_to_str(setup->transform));
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
} }
if (setup->config_file) { if (setup->config_file) {
asprintf(&tmp, "--config=%s", setup->config_file); str_printf(&tmp, "--config=%s", setup->config_file);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
free(setup->config_file); free(setup->config_file);
} else { } else {
@@ -419,11 +421,11 @@ execute_compositor(const struct compositor_setup *setup,
if (ctmp) if (ctmp)
prog_args_take(&args, strdup(ctmp)); prog_args_take(&args, strdup(ctmp));
asprintf(&tmp, "--shell=%s", shell_to_str(setup->shell)); str_printf(&tmp, "--shell=%s", shell_to_str(setup->shell));
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
if (setup->logging_scopes) { if (setup->logging_scopes) {
asprintf(&tmp, "--logger-scopes=%s", setup->logging_scopes); str_printf(&tmp, "--logger-scopes=%s", setup->logging_scopes);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
} }
@@ -472,7 +474,8 @@ open_ini_file(struct compositor_setup *setup)
wd = realpath(".", NULL); wd = realpath(".", NULL);
assert(wd); assert(wd);
if (asprintf(&tmp_path, "%s/%s.ini", wd, setup->testset_name) == -1) { str_printf(&tmp_path, "%s/%s.ini", wd, setup->testset_name);
if (!tmp_path) {
fprintf(stderr, "Fail formatting Weston.ini file name.\n"); fprintf(stderr, "Fail formatting Weston.ini file name.\n");
goto out; goto out;
} }