From b3613c5d02a10b5d58bef63e64a315fff29d6d37 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Wed, 8 Feb 2023 09:07:48 +0100 Subject: [PATCH 1/2] fix: use void for all empty parameter-lists in C functions This is one of many aspects where C and C++ standards deviate: An empty parameter list in C++ is equivalent to a void parameter list. But in C an empty parameter list meant: you can give any number of any types as parameters (difference between declaration and definition ignored for brevity). With C11 this "feature" became obsolete: empty parameter list are no longer standard-conforming C. Since some of those are in our API-surface we should fix this. --- include/sentry.h | 10 +++++----- src/sentry_core.c | 4 ++-- src/sentry_info.c | 6 +++--- src/sentry_scope.c | 4 ++-- src/sentry_scope.h | 4 ++-- src/sentry_sync.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/sentry.h b/include/sentry.h index e7610ea1f..41e86fac5 100644 --- a/include/sentry.h +++ b/include/sentry.h @@ -1861,7 +1861,7 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_iter_headers( * 0 = no crash recognized * -1 = sentry_init() hasn't been called yet */ -SENTRY_EXPERIMENTAL_API int sentry_get_crashed_last_run(); +SENTRY_EXPERIMENTAL_API int sentry_get_crashed_last_run(void); /** * Clear the status of the "crashed-last-run". You should explicitly call @@ -1875,22 +1875,22 @@ SENTRY_EXPERIMENTAL_API int sentry_get_crashed_last_run(); * * Returns 0 on success, 1 on error. */ -SENTRY_EXPERIMENTAL_API int sentry_clear_crashed_last_run(); +SENTRY_EXPERIMENTAL_API int sentry_clear_crashed_last_run(void); /** * Sentry SDK version. */ -SENTRY_EXPERIMENTAL_API const char *sentry_sdk_version(); +SENTRY_EXPERIMENTAL_API const char *sentry_sdk_version(void); /** * Sentry SDK name. */ -SENTRY_EXPERIMENTAL_API const char *sentry_sdk_name(); +SENTRY_EXPERIMENTAL_API const char *sentry_sdk_name(void); /** * Sentry SDK User-Agent. */ -SENTRY_EXPERIMENTAL_API const char *sentry_sdk_user_agent(); +SENTRY_EXPERIMENTAL_API const char *sentry_sdk_user_agent(void); #ifdef __cplusplus } diff --git a/src/sentry_core.c b/src/sentry_core.c index 669948d2d..b10d6065d 100644 --- a/src/sentry_core.c +++ b/src/sentry_core.c @@ -1014,13 +1014,13 @@ sentry_span_finish(sentry_span_t *opaque_span) } int -sentry_get_crashed_last_run() +sentry_get_crashed_last_run(void) { return g_last_crash; } int -sentry_clear_crashed_last_run() +sentry_clear_crashed_last_run(void) { bool success = false; sentry_options_t *options = sentry__options_lock(); diff --git a/src/sentry_info.c b/src/sentry_info.c index b2918127b..ca2f6387a 100644 --- a/src/sentry_info.c +++ b/src/sentry_info.c @@ -1,19 +1,19 @@ #include "sentry_boot.h" const char * -sentry_sdk_version() +sentry_sdk_version(void) { return SENTRY_SDK_VERSION; } const char * -sentry_sdk_name() +sentry_sdk_name(void) { return SENTRY_SDK_NAME; } const char * -sentry_sdk_user_agent() +sentry_sdk_user_agent(void) { return SENTRY_SDK_USER_AGENT; } diff --git a/src/sentry_scope.c b/src/sentry_scope.c index 321b8f41e..0201a673b 100644 --- a/src/sentry_scope.c +++ b/src/sentry_scope.c @@ -118,7 +118,7 @@ sentry__scope_unlock(void) } void -sentry__scope_flush_unlock() +sentry__scope_flush_unlock(void) { sentry__scope_unlock(); SENTRY_WITH_OPTIONS (options) { @@ -245,7 +245,7 @@ sentry__get_span_or_transaction(const sentry_scope_t *scope) #ifdef SENTRY_UNITTEST sentry_value_t -sentry__scope_get_span_or_transaction() +sentry__scope_get_span_or_transaction(void) { SENTRY_WITH_SCOPE (scope) { return sentry__get_span_or_transaction(scope); diff --git a/src/sentry_scope.h b/src/sentry_scope.h index 207b1a995..5b2ba5fe6 100644 --- a/src/sentry_scope.h +++ b/src/sentry_scope.h @@ -68,7 +68,7 @@ void sentry__scope_cleanup(void); * This function must be called while holding the scope lock, and it will be * unlocked internally. */ -void sentry__scope_flush_unlock(); +void sentry__scope_flush_unlock(void); /** * This will merge the requested data which is in the given `scope` to the given @@ -98,5 +98,5 @@ void sentry__scope_apply_to_event(const sentry_scope_t *scope, // this is only used in unit tests #ifdef SENTRY_UNITTEST -sentry_value_t sentry__scope_get_span_or_transaction(); +sentry_value_t sentry__scope_get_span_or_transaction(void); #endif diff --git a/src/sentry_sync.c b/src/sentry_sync.c index e81d776c2..3e4c1940b 100644 --- a/src/sentry_sync.c +++ b/src/sentry_sync.c @@ -68,7 +68,7 @@ sentry__thread_setname(sentry_threadid_t thread_id, const char *thread_name) } #else sentry_threadid_t -sentry__thread_get_current_threadid() +sentry__thread_get_current_threadid(void) { return pthread_self(); } From a5d9e4c4cc239296b1de0a513de81806f02fb7f9 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Wed, 8 Feb 2023 09:25:32 +0100 Subject: [PATCH 2/2] Missed static c_locale() in utils. --- src/sentry_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry_utils.c b/src/sentry_utils.c index 569fa0833..dbafea811 100644 --- a/src/sentry_utils.c +++ b/src/sentry_utils.c @@ -480,7 +480,7 @@ sentry__iso8601_to_msec(const char *iso) // to ensure the C locale is also used there. #if !defined(SENTRY_PLATFORM_ANDROID) && !defined(SENTRY_PLATFORM_IOS) static sentry__locale_t -c_locale() +c_locale(void) { static long c_locale_initialized = 0; static sentry__locale_t c_locale;