diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2017-04-14 11:53:04 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-05-01 14:23:28 -0400 |
| commit | f44903a428cc63ce88bfba26e8e4e2e9b21f058d (patch) | |
| tree | 0cc827eb1d22e07660aec7f6bc7d0ed1760de688 /test | |
| parent | 560ad13c74fe6967991a2429d90eeeba815d1f9e (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)
Diffstat (limited to 'test')
| -rw-r--r-- | test/chacha_internal_test.c | 6 | ||||
| -rw-r--r-- | test/wpackettest.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c index de8e4b2d8b..e3d1c4997b 100644 --- a/test/chacha_internal_test.c +++ b/test/chacha_internal_test.c @@ -17,16 +17,16 @@ #include "testutil.h" #include "internal/chacha.h" -const static unsigned int key[] = { +static const unsigned int key[] = { 0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c, 0x13121110, 0x17161514, 0x1b1a1918, 0x1f1e1d1c }; -const static unsigned int ivp[] = { +static const unsigned int ivp[] = { 0x00000000, 0x00000000, 0x03020100, 0x07060504 }; -const static unsigned char ref[] = { +static const unsigned char ref[] = { 0xf7, 0x98, 0xa1, 0x89, 0xf1, 0x95, 0xe6, 0x69, 0x82, 0x10, 0x5f, 0xfb, 0x64, 0x0b, 0xb7, 0x75, 0x7f, 0x57, 0x9d, 0xa3, 0x16, 0x02, 0xfc, 0x93, diff --git a/test/wpackettest.c b/test/wpackettest.c index a0872c5724..5c7ea10165 100644 --- a/test/wpackettest.c +++ b/test/wpackettest.c @@ -23,15 +23,15 @@ #include "testutil.h" -const static unsigned char simple1[] = { 0xff }; -const static unsigned char simple2[] = { 0x01, 0xff }; -const static unsigned char simple3[] = { 0x00, 0x00, 0x00, 0x01, 0xff }; -const static unsigned char nestedsub[] = { 0x03, 0xff, 0x01, 0xff }; -const static unsigned char seqsub[] = { 0x01, 0xff, 0x01, 0xff }; -const static unsigned char empty[] = { 0x00 }; -const static unsigned char alloc[] = { 0x02, 0xfe, 0xff }; -const static unsigned char submem[] = { 0x03, 0x02, 0xfe, 0xff }; -const static unsigned char fixed[] = { 0xff, 0xff, 0xff }; +static const unsigned char simple1[] = { 0xff }; +static const unsigned char simple2[] = { 0x01, 0xff }; +static const unsigned char simple3[] = { 0x00, 0x00, 0x00, 0x01, 0xff }; +static const unsigned char nestedsub[] = { 0x03, 0xff, 0x01, 0xff }; +static const unsigned char seqsub[] = { 0x01, 0xff, 0x01, 0xff }; +static const unsigned char empty[] = { 0x00 }; +static const unsigned char alloc[] = { 0x02, 0xfe, 0xff }; +static const unsigned char submem[] = { 0x03, 0x02, 0xfe, 0xff }; +static const unsigned char fixed[] = { 0xff, 0xff, 0xff }; static BUF_MEM *buf; |