diff options
Diffstat (limited to 'lib/datum.h')
| -rw-r--r-- | lib/datum.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/datum.h b/lib/datum.h index cdab4b272d..fe847359b0 100644 --- a/lib/datum.h +++ b/lib/datum.h @@ -28,11 +28,13 @@ /* This will copy the provided data in @dat. If the provided data are * NULL or zero-size @dat will be NULL as well. */ +warn_unused_result nonnull((1)) int _gnutls_set_datum(gnutls_datum_t * dat, const void *data, size_t data_size); /* This will always return a non-NULL, and zero-terminated string in @dat. */ +warn_unused_result nonnull((1)) int _gnutls_set_strdatum(gnutls_datum_t * dat, const void *data, size_t data_size); @@ -40,17 +42,13 @@ int _gnutls_set_strdatum(gnutls_datum_t * dat, const void *data, inline static void _gnutls_free_datum(gnutls_datum_t * dat) { - if (dat == NULL) - return; - - if (dat->data != NULL) + if (dat != NULL) { gnutls_free(dat->data); - - dat->data = NULL; - dat->size = 0; + dat->size = 0; + } } -inline static +inline static nonnull_all void _gnutls_free_temp_key_datum(gnutls_datum_t * dat) { if (dat->data != NULL) { @@ -58,11 +56,10 @@ void _gnutls_free_temp_key_datum(gnutls_datum_t * dat) gnutls_free(dat->data); } - dat->data = NULL; dat->size = 0; } -inline static +inline static nonnull_all void _gnutls_free_key_datum(gnutls_datum_t * dat) { if (dat->data != NULL) { @@ -70,7 +67,6 @@ void _gnutls_free_key_datum(gnutls_datum_t * dat) gnutls_free(dat->data); } - dat->data = NULL; dat->size = 0; } |