From cba334f028f64079658f70a502e8dad78f909762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= <89q1r14hd@relay.firefox.com> Date: Mon, 10 Oct 2022 17:49:57 +0300 Subject: [PATCH] treewide: fix some strict-prototypes Clang warnings/errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clang 15 at least with my build configuration emits warnings about function prototypes that lack argument types. Most notably this happens with functions that take no arguments which in compiler view equates to the void type i.e. void f(void) instead of void f(). As I understand, this will become an error in some future Clang release, so might as well fix it now. Since these were discovered not by a linter but by the actual compiler for my particular build configuration, some f() may have escaped for now. But at least it's enough to build PipeWire with most optional features enabled even when -Werror=strict-prototypes is enabled. For anyone else wanting to have a go at this, these can be upgraded from warnings to errors by adding -Werror=strict-prototypes to the custom CFLAGS which probably works with GCC, too, but has only been done with Clang 15.0.2. Finally my editor automatically stripped trailing spaces upon saving the modified files. I assume it's probably not worth keeping those invisible bytes around but this may have slightly dubious implications as it did also turn indented empty lines of JACK license header into regular empty lines. Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> --- pipewire-jack/jack/uuid.h | 10 +++++----- pipewire-jack/src/pipewire-jack.c | 2 +- pipewire-jack/src/uuid.c | 2 +- spa/plugins/bluez5/modemmanager.h | 2 +- spa/tests/benchmark-dict.c | 2 +- spa/tests/benchmark-pod.c | 8 ++++---- src/modules/module-filter-chain/pffft.c | 16 ++++++++-------- src/modules/module-filter-chain/pffft.h | 4 ++-- src/tools/pw-cli.c | 4 ++-- src/tools/pw-dot.c | 2 +- src/tools/pw-top.c | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pipewire-jack/jack/uuid.h b/pipewire-jack/jack/uuid.h index faa354b56..406c1195a 100644 --- a/pipewire-jack/jack/uuid.h +++ b/pipewire-jack/jack/uuid.h @@ -1,18 +1,18 @@ /* Copyright (C) 2013 Paul Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software + along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -30,7 +30,7 @@ extern "C" { #define JACK_UUID_STRING_SIZE (JACK_UUID_SIZE+1) /* includes trailing null */ #define JACK_UUID_EMPTY_INITIALIZER 0 -extern jack_uuid_t jack_client_uuid_generate (); +extern jack_uuid_t jack_client_uuid_generate (void); extern jack_uuid_t jack_port_uuid_generate (uint32_t port_id); extern uint32_t jack_uuid_to_index (jack_uuid_t); diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 7100a41b0..0b01aa9c0 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -5715,7 +5715,7 @@ jack_nframes_t jack_time_to_frames(const jack_client_t *client, jack_time_t usec } SPA_EXPORT -jack_time_t jack_get_time() +jack_time_t jack_get_time(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/pipewire-jack/src/uuid.c b/pipewire-jack/src/uuid.c index 88d8bd881..8584e11e2 100644 --- a/pipewire-jack/src/uuid.c +++ b/pipewire-jack/src/uuid.c @@ -33,7 +33,7 @@ #include SPA_EXPORT -jack_uuid_t jack_client_uuid_generate () +jack_uuid_t jack_client_uuid_generate (void) { static uint32_t uuid_cnt = 0; jack_uuid_t uuid = 0x2; /* JackUUIDClient */; diff --git a/spa/plugins/bluez5/modemmanager.h b/spa/plugins/bluez5/modemmanager.h index 869dfd785..a239b2ace 100644 --- a/spa/plugins/bluez5/modemmanager.h +++ b/spa/plugins/bluez5/modemmanager.h @@ -114,7 +114,7 @@ bool mm_is_available(void *modemmanager) return false; } -unsigned int mm_supported_features() +unsigned int mm_supported_features(void) { return 0; } diff --git a/spa/tests/benchmark-dict.c b/spa/tests/benchmark-dict.c index 9d189b73f..c47845e7b 100644 --- a/spa/tests/benchmark-dict.c +++ b/spa/tests/benchmark-dict.c @@ -39,7 +39,7 @@ static struct spa_dict_item items[MAX_ITEMS]; static char values[MAX_ITEMS][32]; -static void gen_values() +static void gen_values(void) { uint32_t i, j, idx; static const char chars[] = "abcdefghijklmnopqrstuvwxyz.:*ABCDEFGHIJKLMNOPQRSTUVWXYZ"; diff --git a/spa/tests/benchmark-pod.c b/spa/tests/benchmark-pod.c index 43ac20b3b..8af1a5f96 100644 --- a/spa/tests/benchmark-pod.c +++ b/spa/tests/benchmark-pod.c @@ -37,7 +37,7 @@ #define MAX_COUNT 10000000 -static void test_builder() +static void test_builder(void) { uint8_t buffer[1024]; struct spa_pod_builder b = { NULL, }; @@ -90,7 +90,7 @@ static void test_builder() t2 - t1, count, count * (uint64_t)SPA_NSEC_PER_SEC / (t2 - t1)); } -static void test_builder2() +static void test_builder2(void) { uint8_t buffer[1024]; struct spa_pod_builder b = { NULL, }; @@ -131,7 +131,7 @@ static void test_builder2() t2 - t1, count, count * (uint64_t)SPA_NSEC_PER_SEC / (t2 - t1)); } -static void test_parse() +static void test_parse(void) { uint8_t buffer[1024]; struct spa_pod_builder b = { NULL, }; @@ -216,7 +216,7 @@ static void test_parse() t2 - t1, count, count * (uint64_t)SPA_NSEC_PER_SEC / (t2 - t1)); } -static void test_parser() +static void test_parser(void) { uint8_t buffer[1024]; struct spa_pod_builder b = { NULL, }; diff --git a/src/modules/module-filter-chain/pffft.c b/src/modules/module-filter-chain/pffft.c index d89a70949..2f65e3fcd 100644 --- a/src/modules/module-filter-chain/pffft.c +++ b/src/modules/module-filter-chain/pffft.c @@ -25,7 +25,7 @@ Laboratory, the University Corporation for Atmospheric Research, nor the names of its sponsors or contributors may be used to endorse or promote products derived from this Software without - specific prior written permission. + specific prior written permission. - Redistributions of source code must retain the above copyright notices, this list of conditions, and the disclaimer below. @@ -52,7 +52,7 @@ */ /* - ChangeLog: + ChangeLog: - 2011/10/02, version 1: This is the very first release of this file. */ @@ -243,7 +243,7 @@ typedef union v4sf_union { #define assertv4(v,f0,f1,f2,f3) assert(v.f[0] == (f0) && v.f[1] == (f1) && v.f[2] == (f2) && v.f[3] == (f3)) /* detect bugs with the vector support macros */ -static void validate_pffft_simd() +static void validate_pffft_simd(void) { float f[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; v4sf_union a0, a1, a2, a3, t, u; @@ -301,7 +301,7 @@ static void validate_pffft_simd() assertv4(a3, 3, 7, 11, 15); } #else -static void validate_pffft_simd() +static void validate_pffft_simd(void) { } // allow test_pffft.c to call this function even when simd is not available.. #endif //!PFFFT_SIMD_DISABLE @@ -1421,7 +1421,7 @@ static PFFFT_Setup *new_setup_simd(int N, pffft_transform_t transform) { PFFFT_Setup *s = (PFFFT_Setup *) malloc(sizeof(PFFFT_Setup)); int k, m; - /* unfortunately, the fft size must be a multiple of 16 for complex FFTs + /* unfortunately, the fft size must be a multiple of 16 for complex FFTs and 32 for real FFTs -- a lot of stuff would need to be rewritten to handle other cases (or maybe just switch to a scalar fft, I don't know..) */ if (transform == PFFFT_REAL) { @@ -1615,7 +1615,7 @@ static void pffft_cplx_finalize(int Ncvec, const v4sf * in, v4sf * out, const v4 [0 0 0 0 1 1 1 1] * [i0] [0 1 0 -1 1 0 -1 0] [i1] [0 0 0 0 1 -1 1 -1] [i2] - [0 -1 0 1 1 0 -1 0] [i3] + [0 -1 0 1 1 0 -1 0] [i3] */ r0 = VADD(sr0, sr1); @@ -1719,7 +1719,7 @@ static ALWAYS_INLINE(void) pffft_real_finalize_4x4(const v4sf * in0, [0 0 0 0 1 1 1 1] * [i0] [0 -1 0 1 -1 0 1 0] [i1] [0 -1 0 1 1 0 -1 0] [i2] - [0 0 0 0 -1 1 -1 1] [i3] + [0 0 0 0 -1 1 -1 1] [i3] */ //cerr << "matrix initial, before e , REAL:\n 1: " << r0 << "\n 1: " << r1 << "\n 1: " << r2 << "\n 1: " << r3 << "\n"; @@ -1832,7 +1832,7 @@ static ALWAYS_INLINE(void) pffft_real_preprocess_4x4(const v4sf * in, [0 0 0 0 1 -1 1 -1] * [i0] [0 -1 1 0 1 0 0 1] [i1] [0 0 0 0 1 1 -1 -1] [i2] - [0 1 -1 0 1 0 0 1] [i3] + [0 1 -1 0 1 0 0 1] [i3] */ v4sf sr0 = VADD(r0, r3), dr0 = VSUB(r0, r3); diff --git a/src/modules/module-filter-chain/pffft.h b/src/modules/module-filter-chain/pffft.h index 75e0d21cd..ca58676fb 100644 --- a/src/modules/module-filter-chain/pffft.h +++ b/src/modules/module-filter-chain/pffft.h @@ -165,13 +165,13 @@ extern "C" { /* the float buffers must have the correct alignment (16-byte boundary on intel and powerpc). This function may be used to obtain such - correctly aligned buffers. + correctly aligned buffers. */ void *pffft_aligned_malloc(size_t nb_bytes); void pffft_aligned_free(void *); /* return 4 or 1 depending on whether support for SSE/Altivec instructions was enabled when building pffft.c */ - int pffft_simd_size(); + int pffft_simd_size(void); void pffft_select_cpu(int flags); diff --git a/src/tools/pw-cli.c b/src/tools/pw-cli.c index 1ac8ab0f5..bb5ab99cb 100644 --- a/src/tools/pw-cli.c +++ b/src/tools/pw-cli.c @@ -2226,13 +2226,13 @@ readline_command_completion(const char *text, int start, int end) return matches; } -static void readline_init() +static void readline_init(void) { rl_attempted_completion_function = readline_command_completion; rl_callback_handler_install(">> ", input_process_line); } -static void readline_cleanup() +static void readline_cleanup(void) { rl_callback_handler_remove(); } diff --git a/src/tools/pw-dot.c b/src/tools/pw-dot.c index eed63512a..680bd2488 100644 --- a/src/tools/pw-dot.c +++ b/src/tools/pw-dot.c @@ -94,7 +94,7 @@ struct global { struct spa_hook object_listener; }; -static char *dot_str_new() +static char *dot_str_new(void) { return strdup(""); } diff --git a/src/tools/pw-top.c b/src/tools/pw-top.c index 459dacb11..4ad7c28eb 100644 --- a/src/tools/pw-top.c +++ b/src/tools/pw-top.c @@ -612,7 +612,7 @@ static void show_help(const char *name, bool error) name); } -static void terminal_start() +static void terminal_start(void) { initscr(); cbreak(); @@ -620,7 +620,7 @@ static void terminal_start() refresh(); } -static void terminal_stop() +static void terminal_stop(void) { endwin(); }