From 49a6a3da1d114b61c76d0540cd4fa8beb6d7f108 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 1 Oct 2021 15:56:42 +0200
Subject: [PATCH] Squashed 'src/c-stdaux/' changes from
 346623b40eb8..8652c488b8f1

8652c488b8f1 test: provide prototypes
c5f166d02ff6 test: remove unnecessary unused attribute from main argc
8572cd4d1225 test: remove unused args from main
5c4f161f9c11 test: add missing _c_unused_

git-subtree-dir: src/c-stdaux
git-subtree-split: 8652c488b8f1c29629a5179d4551d0a691ae5901
---
 src/test-api.c   | 12 +++++++-----
 src/test-basic.c |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/test-api.c b/src/test-api.c
index fb500660b0..cddbb70dac 100644
--- a/src/test-api.c
+++ b/src/test-api.c
@@ -11,15 +11,17 @@
 
 static _c_const_ int const_fn(void) { return 0; }
 static _c_deprecated_ _c_unused_ int deprecated_fn(void) { return 0; }
+_c_hidden_ int c_internal_hidden_fn(void);
 _c_hidden_ int c_internal_hidden_fn(void) { return 0; }
-static _c_printf_(1, 2) int printf_fn(const char *f, ...) { return 0; }
+static _c_printf_(1, 2) int printf_fn(const _c_unused_ char *f, ...) { return 0; }
+_c_public_ int c_internal_public_fn(void);
 _c_public_ int c_internal_public_fn(void) { return 0; }
 static _c_pure_ int pure_fn(void) { return 0; }
-static _c_sentinel_ int sentinel_fn(const char *f, ...) { return 0; }
+static _c_sentinel_ int sentinel_fn(const _c_unused_ char *f, ...) { return 0; }
 static _c_unused_ int unused_fn(void) { return 0; }
 
-static void cleanup_fn(int p) {}
-static void direct_cleanup_fn(int p) {}
+static void cleanup_fn(_c_unused_ int p) {}
+static void direct_cleanup_fn(_c_unused_ int p) {}
 C_DEFINE_CLEANUP(int, cleanup_fn);
 C_DEFINE_DIRECT_CLEANUP(int, direct_cleanup_fn);
 
@@ -202,7 +204,7 @@ static void test_api_functions(void) {
                 c_assert(!!fns[i]);
 }
 
-int main(int argc, char **argv) {
+int main(void) {
         test_api_macros();
         test_api_functions();
         return 0;
diff --git a/src/test-basic.c b/src/test-basic.c
index 9549a14303..d58d561d23 100644
--- a/src/test-basic.c
+++ b/src/test-basic.c
@@ -425,7 +425,7 @@ static void test_destructors(void) {
         }
 }
 
-int main(int argc, char **argv) {
+int main(int argc, _c_unused_ char **argv) {
         test_misc(argc);
         test_destructors();
         return 0;