kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix |-Werror=old-style-declaration| violations in poly1305_vec.c.

Browse Source 
The |inline| must appear before the type.

Change-Id: Iecebbcc50024a846d7804228a858acfc33d68efd
Reviewed-on: https://boringssl-review.googlesource.com/7010
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Brian Smith 2016-01-27 23:11:04 -10:00 committed by David Benjamin
parent 2cdf398773
commit 5fa8f5bc9a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/poly1305/poly1305_vec.c
View File

@ -39,21 +39,21 @@ static const alignas(16) uint32_t poly1305_x64_sse2_5[4] = {5, 0, 5, 0};
static const alignas(16) uint32_t poly1305_x64_sse2_1shl128[4] = { static const alignas(16) uint32_t poly1305_x64_sse2_1shl128[4] = {
(1 << 24), 0, (1 << 24), 0}; (1 << 24), 0, (1 << 24), 0};
static uint128_t inline add128(uint128_t a, uint128_t b) { return a + b; } static inline uint128_t add128(uint128_t a, uint128_t b) { return a + b; }
static uint128_t inline add128_64(uint128_t a, uint64_t b) { return a + b; } static inline uint128_t add128_64(uint128_t a, uint64_t b) { return a + b; }
static uint128_t inline mul64x64_128(uint64_t a, uint64_t b) { static inline uint128_t mul64x64_128(uint64_t a, uint64_t b) {
return (uint128_t)a * b; return (uint128_t)a * b;
} }
static uint64_t inline lo128(uint128_t a) { return (uint64_t)a; } static inline uint64_t lo128(uint128_t a) { return (uint64_t)a; }
static uint64_t inline shr128(uint128_t v, const int shift) { static inline uint64_t shr128(uint128_t v, const int shift) {
return (uint64_t)(v >> shift); return (uint64_t)(v >> shift);
} }
static uint64_t inline shr128_pair(uint64_t hi, uint64_t lo, const int shift) { static inline uint64_t shr128_pair(uint64_t hi, uint64_t lo, const int shift) {
return (uint64_t)((((uint128_t)hi << 64) | lo) >> shift); return (uint64_t)((((uint128_t)hi << 64) | lo) >> shift);
} }
@ -80,13 +80,13 @@ typedef struct poly1305_state_internal_t {
} poly1305_state_internal; /* 448 bytes total + 63 bytes for } poly1305_state_internal; /* 448 bytes total + 63 bytes for
alignment = 511 bytes raw */ alignment = 511 bytes raw */
static poly1305_state_internal inline *poly1305_aligned_state( static inline poly1305_state_internal *poly1305_aligned_state(
poly1305_state *state) { poly1305_state *state) {
return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63); return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63);
} }
/* copy 0-63 bytes */ /* copy 0-63 bytes */
static void inline static inline void
poly1305_block_copy(uint8_t *dst, const uint8_t *src, size_t bytes) { poly1305_block_copy(uint8_t *dst, const uint8_t *src, size_t bytes) {
size_t offset = src - dst; size_t offset = src - dst;
if (bytes & 32) { if (bytes & 32) {
@ -118,7 +118,7 @@ poly1305_block_copy(uint8_t *dst, const uint8_t *src, size_t bytes) {
} }
/* zero 0-15 bytes */ /* zero 0-15 bytes */
static void inline poly1305_block_zero(uint8_t *dst, size_t bytes) { static inline void poly1305_block_zero(uint8_t *dst, size_t bytes) {
if (bytes & 8) { if (bytes & 8) {
*(uint64_t *)dst = 0; *(uint64_t *)dst = 0;
dst += 8; dst += 8;
@ -136,7 +136,7 @@ static void inline poly1305_block_zero(uint8_t *dst, size_t bytes) {
} }
} }
static size_t inline poly1305_min(size_t a, size_t b) { static inline size_t poly1305_min(size_t a, size_t b) {
return (a < b) ? a : b; return (a < b) ? a : b;
} }