summaryrefslogtreecommitdiffstats
path: root/crypto/cast
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2017-04-14 11:53:04 -0500
committerRich Salz <rsalz@openssl.org>2017-06-20 13:35:33 -0400
commitbd97dde41e96193aa076260fb0057e9ce0f6861b (patch)
tree10aaf85ec777ee5eeb31bfe51bcf1aa63a46c6f5 /crypto/cast
parent725f121dcfc31d016fa23bfffde1b6342659949e (diff)
Address some -Wold-style-declaration warnings
gcc's -Wextra pulls in -Wold-style-declaration, which triggers when a declaration has a storage-class specifier as a non-initial qualifier. The ISO C formal grammar requires the storage-class to be the first component of the declaration, if present. Seeint as the register storage-class specifier does not really have any effect anymore with modern compilers, remove it entirely while we're here, instead of fixing up the order. Interestingly, the gcc devteam warnings do not pull in -Wextra, though the clang ones do. [extended tests] Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3239) (cherry picked from commit f44903a428cc63ce88bfba26e8e4e2e9b21f058d)
Diffstat (limited to 'crypto/cast')
-rw-r--r--crypto/cast/c_enc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index 9a85812591..700b6d162a 100644
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -12,8 +12,8 @@
void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
{
- register CAST_LONG l, r, t;
- const register CAST_LONG *k;
+ CAST_LONG l, r, t;
+ const CAST_LONG *k;
k = &(key->data[0]);
l = data[0];
@@ -44,8 +44,8 @@ void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key)
void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
{
- register CAST_LONG l, r, t;
- const register CAST_LONG *k;
+ CAST_LONG l, r, t;
+ const CAST_LONG *k;
k = &(key->data[0]);
l = data[0];