From 7e3c56ba1ef20d10d0dc3126d3d52d5c4fef5517 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Sat, 6 Feb 2021 11:44:49 +0100 Subject: [PATCH] Use G_GNUC_NULL_TERMINATED where appropriate Give our API consumers an extra hint if they're using varargs without an appropriate `NULL`-sentinel. --- libsecret/secret-attributes.h | 2 +- libsecret/secret-password.h | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libsecret/secret-attributes.h b/libsecret/secret-attributes.h index 43e6035..5ec1931 100644 --- a/libsecret/secret-attributes.h +++ b/libsecret/secret-attributes.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS GHashTable * secret_attributes_build (const SecretSchema *schema, - ...); + ...) G_GNUC_NULL_TERMINATED; GHashTable * secret_attributes_buildv (const SecretSchema *schema, va_list va); diff --git a/libsecret/secret-password.h b/libsecret/secret-password.h index 0719317..2c61483 100644 --- a/libsecret/secret-password.h +++ b/libsecret/secret-password.h @@ -46,13 +46,13 @@ void secret_password_storev (const SecretSchema *sche gpointer user_data); void secret_password_store_binary (const SecretSchema *schema, - const gchar *collection, - const gchar *label, - SecretValue *value, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - ...); + const char *collection, + const char *label, + SecretValue *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + ...) G_GNUC_NULL_TERMINATED; void secret_password_storev_binary (const SecretSchema *schema, GHashTable *attributes, @@ -83,12 +83,12 @@ gboolean secret_password_storev_sync (const SecretSchema *sche GError **error); gboolean secret_password_store_binary_sync (const SecretSchema *schema, - const gchar *collection, - const gchar *label, - SecretValue *value, - GCancellable *cancellable, - GError **error, - ...); + const char *collection, + const char *label, + SecretValue *value, + GCancellable *cancellable, + GError **error, + ...) G_GNUC_NULL_TERMINATED; gboolean secret_password_storev_binary_sync (const SecretSchema *schema, GHashTable *attributes, @@ -126,11 +126,11 @@ gchar * secret_password_lookup_sync (const SecretSchema *sche gchar * secret_password_lookup_nonpageable_sync (const SecretSchema *schema, GCancellable *cancellable, GError **error, - ...); + ...) G_GNUC_NULL_TERMINATED; SecretValue *secret_password_lookup_binary_sync (const SecretSchema *schema, - GCancellable *cancellable, - GError **error, - ...); + GCancellable *cancellable, + GError **error, + ...) G_GNUC_NULL_TERMINATED; gchar * secret_password_lookupv_sync (const SecretSchema *schema, GHashTable *attributes,