diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2018-08-16 15:42:55 -0500 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2018-08-17 13:57:23 -0500 |
| commit | 50f3994b513ead4da94845bf38222bb71c440fb3 (patch) | |
| tree | 9e9b4498cddcdb8075ff96beae608f62b24d9df8 /crypto | |
| parent | d2b863643d94704abd9840519cfc54d22d0481fe (diff) | |
Avoid shadowing 'free' in X509_LOOKUP_met_set_free
gcc 4.6 (arguably erroneously) warns about our use of 'free' as
the name of a function parameter, when --strict-warnings is enabled:
crypto/x509/x509_meth.c: In function 'X509_LOOKUP_meth_set_free':
crypto/x509/x509_meth.c:61:12: error: declaration of 'free' shadows a global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
make[1]: *** [crypto/x509/x509_meth.o] Error 1
(gcc 4.8 is fine with this code, as are newer compilers.)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6991)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/x509/x509_meth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c index 05ed4bf863..9dc587a092 100644 --- a/crypto/x509/x509_meth.c +++ b/crypto/x509/x509_meth.c @@ -58,9 +58,9 @@ int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method)) int X509_LOOKUP_meth_set_free( X509_LOOKUP_METHOD *method, - void (*free) (X509_LOOKUP *ctx)) + void (*free_fn) (X509_LOOKUP *ctx)) { - method->free = free; + method->free = free_fn; return 1; } |