diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | hv_func.h | 6 | ||||
| -rw-r--r-- | hv_macro.h | 2 | ||||
| -rw-r--r-- | inline.h | 4 | ||||
| -rw-r--r-- | sbox32_hash.h | 4 | ||||
| -rw-r--r-- | zaphod32_hash.h | 2 |
6 files changed, 10 insertions, 9 deletions
@@ -153,6 +153,7 @@ Bah <bah@longitude.com> Barrie Slaymaker <barries@slaysys.com> Barry Friedman Bart Kedryna <bkedryna@home.com> +Bart Van Assche <bvanassche@acm.org> Bas van Sisseren <bas@quarantainenet.nl> Beau Cox Ben Carter <bcarter@gumdrop.flyinganvil.org> @@ -62,7 +62,7 @@ # define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 2) # define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 4) # define PVT__PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) -# define PVT__PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_1_3_with_state((state),(U8*)(str),(len)) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_1_3_with_state((state),(const U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_ZAPHOD32) # define PERL_HASH_FUNC_DEFINE "PERL_HASH_FUNC_ZAPHOD32" # define PVT__PERL_HASH_FUNC "ZAPHOD32" @@ -119,7 +119,7 @@ #define PVT_PERL_HASH_WITH_STATE(state,str,len) \ (LIKELY(len <= SBOX32_MAX_LEN) \ - ? sbox32_hash_with_state((state + PVT__PERL_HASH_STATE_BYTES),(U8*)(str),(len)) \ + ? sbox32_hash_with_state((state + PVT__PERL_HASH_STATE_BYTES),(const U8*)(str),(len)) \ : PVT__PERL_HASH_WITH_STATE((state),(str),(len))) #endif @@ -127,7 +127,7 @@ #define PERL_HASH_WITH_SEED(seed,hash,str,len) \ (hash) = S_perl_hash_with_seed((const U8 *) seed, (const U8 *) str,len) #define PERL_HASH_WITH_STATE(state,hash,str,len) \ - (hash) = PVT_PERL_HASH_WITH_STATE((state),(U8*)(str),(len)) + (hash) = PVT_PERL_HASH_WITH_STATE((state),(const U8*)(str),(len)) #define PERL_HASH_SEED_STATE(seed,state) PVT_PERL_HASH_SEED_STATE(seed,state) #define PERL_HASH_SEED_BYTES PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_SEED_BYTES) diff --git a/hv_macro.h b/hv_macro.h index 3f75cdb860..c052653c35 100644 --- a/hv_macro.h +++ b/hv_macro.h @@ -30,7 +30,7 @@ */ #ifndef U8TO16_LE - #define _shifted_octet(type,ptr,idx,shift) (((type)(((U8*)(ptr))[(idx)]))<<(shift)) + #define _shifted_octet(type,ptr,idx,shift) (((type)(((const U8*)(ptr))[(idx)]))<<(shift)) #if defined(USE_UNALIGNED_PTR_DEREF) && (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) #define U8TO16_LE(ptr) (*((const U16*)(ptr))) #define U8TO32_LE(ptr) (*((const U32*)(ptr))) @@ -568,7 +568,7 @@ Perl_is_utf8_invariant_string_loc(const U8* const s, STRLEN len, const U8 ** ep) /* Here, we know we have at least one full word to process. Process * per-word as long as we have at least a full word left */ do { - if ((* (PERL_UINTMAX_T *) x) & PERL_VARIANTS_WORD_MASK) { + if ((* (const PERL_UINTMAX_T *) x) & PERL_VARIANTS_WORD_MASK) { /* Found a variant. Just return if caller doesn't want its * exact position */ @@ -579,7 +579,7 @@ Perl_is_utf8_invariant_string_loc(const U8* const s, STRLEN len, const U8 ** ep) # if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 \ || BYTEORDER == 0x4321 || BYTEORDER == 0x87654321 - *ep = x + variant_byte_number(* (PERL_UINTMAX_T *) x); + *ep = x + variant_byte_number(* (const PERL_UINTMAX_T *) x); assert(*ep >= s && *ep < send); return FALSE; diff --git a/sbox32_hash.h b/sbox32_hash.h index 04078ae809..594431ba0d 100644 --- a/sbox32_hash.h +++ b/sbox32_hash.h @@ -1409,7 +1409,7 @@ SBOX32_STATIC_INLINE void sbox32_seed_state128 ( const U8 *seed_ch, U8 *state_ch ) { - U32 *seed= (U32 *)seed_ch; + const U32 *seed= (const U32 *)seed_ch; U32 *state= (U32 *)state_ch; U32 *state_cursor = state + 1; U32 *sbox32_end = state + 1 + (256 * SBOX32_MAX_LEN); @@ -1458,7 +1458,7 @@ SBOX32_STATIC_INLINE U32 sbox32_hash_with_state( const U8 *key, const STRLEN key_len ) { - U32 *state= (U32 *)state_ch; + const U32 *state= (const U32 *)state_ch; U32 hash = *state; switch (key_len) { default: return zaphod32_hash_with_state(state_ch, key, key_len); diff --git a/zaphod32_hash.h b/zaphod32_hash.h index 8b15adfb45..bf802ccbb7 100644 --- a/zaphod32_hash.h +++ b/zaphod32_hash.h @@ -178,7 +178,7 @@ U32 zaphod32_hash_with_state( const U8 *key, const STRLEN key_len ) { - U32 *state= (U32 *)state_ch; + const U32 *state= (const U32 *)state_ch; const U8 *end; STRLEN len = key_len; U32 v0= state[0]; |